summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-03-26 02:34:19 (EDT)
committerManik Kishore2012-06-19 07:23:29 (EDT)
commit1d732a5aac6aea613454311c048f834249b61954 (patch)
tree1503e4d42c198a7ceb90c7724bbd5e3a514ef083
parent51bd97ff023c4e6583617961014d4283f38b8f0e (diff)
downloadorg.eclipse.stardust.ui.web-1d732a5aac6aea613454311c048f834249b61954.zip
org.eclipse.stardust.ui.web-1d732a5aac6aea613454311c048f834249b61954.tar.gz
org.eclipse.stardust.ui.web-1d732a5aac6aea613454311c048f834249b61954.tar.bz2
Jira-ID: CRNT-24315
1)Added code to show Error message when user tries to detach non-case member from case. 2)Added views-common-messages.properties property views.attachToCase.caseDetach.nonCaseProcessError git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54879 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java9
-rw-r--r--views-common/src/main/resources/views-common-messages.properties1
-rw-r--r--views-common/src/main/resources/views-common-messages_de.properties1
-rw-r--r--views-common/src/main/resources/views-common-messages_ja.properties1
-rw-r--r--views-common/src/main/resources/views-common-messages_zh_CN.properties1
5 files changed, 12 insertions, 1 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java
index 1d2a2d3..f0ad727 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java
@@ -354,7 +354,14 @@ public class CaseDetailsBean extends PopupUIComponentBean
ProcessInstance rootProcessInstance = ProcessInstanceUtils.getRootProcessInstance(pi, false);
Set<Long> childPIs = countImmediateChilds(rootProcessInstance);
- if (childPIs.contains(pi.getOID()) && activeChildProcessCount == 1)
+ if(!childPIs.contains(pi.getOID()))
+ {
+ MessagePropertiesBean messageBean = MessagePropertiesBean.getInstance();
+ MessageDialog.addMessage(MessageType.ERROR, messageBean.getString("common.error"),
+ COMMON_MESSAGE_BEAN.getString("views.attachToCase.caseDetach.nonCaseProcessError"));
+ return;
+ }
+ else if (childPIs.contains(pi.getOID()) && activeChildProcessCount == 1)
{
if (childPIs.size() == activeChildProcessCount)
{
diff --git a/views-common/src/main/resources/views-common-messages.properties b/views-common/src/main/resources/views-common-messages.properties
index 087afcf..dcddf92 100644
--- a/views-common/src/main/resources/views-common-messages.properties
+++ b/views-common/src/main/resources/views-common-messages.properties
@@ -1470,6 +1470,7 @@ views.attachToCase.inputIsCase.message=Process OID is invalid.
views.attachToCase.caseDetach.rootError=Cannot detach root process from Case.
views.detachCase.notification.msg=Detaching the Process will {0} the Case.
views.detachCase.notification.confirm=Do you want to continue?
+views.attachToCase.caseDetach.nonCaseProcessError=Please select only case member to detach from Case.
views.attachToCase.caseAttach.notAuthorizedToManageCase = You are not authorized to manage this Case.
views.attachToCase.caseProcess.notSelectMultipleCases = Please select only one Case to Attach To Case.
diff --git a/views-common/src/main/resources/views-common-messages_de.properties b/views-common/src/main/resources/views-common-messages_de.properties
index 7278fb5..4614f70 100644
--- a/views-common/src/main/resources/views-common-messages_de.properties
+++ b/views-common/src/main/resources/views-common-messages_de.properties
@@ -1467,6 +1467,7 @@ views.attachToCase.inputIsCase.message=Process OID is invalid.
views.attachToCase.caseDetach.rootError=+Cannot detach root process from Case.
views.detachCase.notification.msg=+Detaching the Process will {0} the Case.
views.detachCase.notification.confirm=+Do you want to continue?
+views.attachToCase.caseDetach.nonCaseProcessError=+Please select only case member to detach from Case.
views.attachToCase.caseAttach.notAuthorizedToManageCase =+You are not authorized to manage this Case.
views.attachToCase.caseProcess.notSelectMultipleCases = +Please select only one Case to Attach To Case.
diff --git a/views-common/src/main/resources/views-common-messages_ja.properties b/views-common/src/main/resources/views-common-messages_ja.properties
index 299e8a2..146e05d 100644
--- a/views-common/src/main/resources/views-common-messages_ja.properties
+++ b/views-common/src/main/resources/views-common-messages_ja.properties
@@ -1467,6 +1467,7 @@ views.attachToCase.inputIsCase.message = Process OID is invalid.
views.attachToCase.caseDetach.rootError = +Cannot detach root process from Case.
views.detachCase.notification.msg=+Detaching the Process will {0} the Case.
views.detachCase.notification.confirm = +Do you want to continue?
+views.attachToCase.caseDetach.nonCaseProcessError=+Please select only case member to detach from Case.
views.attachToCase.caseAttach.notAuthorizedToManageCase = +You are not authorized to manage this Case.
views.attachToCase.caseProcess.notSelectMultipleCases = +Please select only one Case to Attach To Case.
diff --git a/views-common/src/main/resources/views-common-messages_zh_CN.properties b/views-common/src/main/resources/views-common-messages_zh_CN.properties
index 8ca27b8..09ec6ef 100644
--- a/views-common/src/main/resources/views-common-messages_zh_CN.properties
+++ b/views-common/src/main/resources/views-common-messages_zh_CN.properties
@@ -1468,6 +1468,7 @@ views.attachToCase.inputIsCase.message = \u8FDB\u7A0BOID\u65E0\u6548\u3002
views.attachToCase.caseDetach.rootError = \u4E0D\u80FD\u4ECE\u6848\u4F8B\u8131\u79BB\u6839\u8FDB\u7A0B\u3002
views.detachCase.notification.msg=+Detaching the Process will {0} the Case.
views.detachCase.notification.confirm = \u662F\u5426\u7EE7\u7EED\uFF1F
+views.attachToCase.caseDetach.nonCaseProcessError=+Please select only case member to detach from Case.
views.attachToCase.caseAttach.notAuthorizedToManageCase = \u60A8\u6CA1\u6709\u88AB\u6388\u6743\u7BA1\u7406\u8FD9\u4E2A\u6848\u4F8B\u3002
views.attachToCase.caseProcess.notSelectMultipleCases = \u8BF7\u9009\u62E9\u4E00\u4E2A\u6848\u4F8B\u9644\u52A0\u5230\u6B64\u6848\u4EF6\u3002