summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-03-28 06:00:36 (EDT)
committer Manik Kishore2012-06-19 07:24:05 (EDT)
commitb332fd846f56d93bce96838ff272e597988b449d (patch)
tree21c77ade9a4378aacaf6d5d8c520988422ff7262
parente41572a9d46e70ffde77104590da09465a4bdce0 (diff)
downloadorg.eclipse.stardust.ui.web-b332fd846f56d93bce96838ff272e597988b449d.zip
org.eclipse.stardust.ui.web-b332fd846f56d93bce96838ff272e597988b449d.tar.gz
org.eclipse.stardust.ui.web-b332fd846f56d93bce96838ff272e597988b449d.tar.bz2
Jira-ID: CRNT-22765
1)added condition to restrict delegation for Case Activity 2)Fixed a merge issue : pick from list should be populated on load. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@55011 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DelegationBean.java25
-rw-r--r--views-common/src/main/resources/views-common-messages.properties2
-rw-r--r--views-common/src/main/resources/views-common-messages_de.properties2
-rw-r--r--views-common/src/main/resources/views-common-messages_ja.properties2
-rw-r--r--views-common/src/main/resources/views-common-messages_zh_CN.properties2
5 files changed, 28 insertions, 5 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DelegationBean.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DelegationBean.java
index deb6516..1c6fcbe 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DelegationBean.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/dialogs/DelegationBean.java
@@ -45,6 +45,7 @@ import org.eclipse.stardust.engine.api.runtime.DepartmentInfo;
import org.eclipse.stardust.engine.api.runtime.PerformerType;
import org.eclipse.stardust.engine.api.runtime.User;
import org.eclipse.stardust.ui.web.common.PopupUIComponentBean;
+import org.eclipse.stardust.ui.web.common.message.MessageDialog;
import org.eclipse.stardust.ui.web.common.util.FacesUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.ManagedBeanUtils;
import org.eclipse.stardust.ui.web.viewscommon.beans.SessionContext;
@@ -593,11 +594,24 @@ public class DelegationBean extends PopupUIComponentBean
*/
public void openPopup()
{
- super.openPopup();
- initialize();
- participantTree.resetPreviousSelection();
- // retrieveParticipants();
- // FacesUtils.refreshPage();
+ boolean isCaseActivities = ActivityInstanceUtils.isContainsCaseActivity(ais);
+ if (!delegateCase && isCaseActivities)
+ {
+ MessageDialog.addErrorMessage(MessagesViewsCommonBean.getInstance().getString("delegation.cantDelegateCase.message"));
+
+ return;
+ }
+ else if (delegateCase && !isCaseActivities)
+ {
+ MessageDialog.addErrorMessage(MessagesViewsCommonBean.getInstance().getString("delegation.selectOnlyCase.message"));
+ return;
+ }
+ else
+ {
+ super.openPopup();
+ initialize();
+ participantTree.resetPreviousSelection();
+ }
}
/* (non-Javadoc)
@@ -1151,6 +1165,7 @@ public class DelegationBean extends PopupUIComponentBean
public void setSelectMode()
{
delegationMode = DELEGATION_MODE.PICK_FROM_LIST;
+ retrieveParticipants();
}
public void setSearchMode()
diff --git a/views-common/src/main/resources/views-common-messages.properties b/views-common/src/main/resources/views-common-messages.properties
index 427f73e..ae955e2 100644
--- a/views-common/src/main/resources/views-common-messages.properties
+++ b/views-common/src/main/resources/views-common-messages.properties
@@ -646,6 +646,8 @@ delegation.note.label=Note
delegation.tooltip.title=Delegate
delegation.error=Cannot delegate Activity with OID {0}, since it is in Active state.
delegation.notAuthorizedonSuspend.message=You are not authorized to delegate.\n{0}
+delegation.cantDelegateCase.message=Cannot delegate Case Activity.
+delegation.selectOnlyCase.message=Please select Case Process to change owner.
delegation.select.toggleLinkText=Search for Participant
delegation.applyButton.text=OK
delegation.noParticipantSelected.message=No participant selected.
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 c0aa909..84eb4e8 100644
--- a/views-common/src/main/resources/views-common-messages_de.properties
+++ b/views-common/src/main/resources/views-common-messages_de.properties
@@ -643,6 +643,8 @@ delegation.note.label = Notiz
delegation.tooltip.title = Delegieren
delegation.error = Aktivit\u00E4t mit OID {0} kann nicht delegiert werden, da Status aktiv.
delegation.notAuthorizedonSuspend.message = Sie haben keine Berechtigung zum Delegieren.\n{0}
+delegation.cantDelegateCase.message=+Cannot delegate Case Activity.
+delegation.selectOnlyCase.message=+Please select Case Process to change owner.
delegation.select.toggleLinkText = Participant Suchen
delegation.applyButton.text = OK
delegation.noParticipantSelected.message = Kein Participant ausgew\u00E4hlt.
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 4febf19..dfbbc2a 100644
--- a/views-common/src/main/resources/views-common-messages_ja.properties
+++ b/views-common/src/main/resources/views-common-messages_ja.properties
@@ -643,6 +643,8 @@ delegation.note.label = \u30CE\u30FC\u30C8
delegation.tooltip.title = \u59D4\u8B72
delegation.error = OID {0} \u306E\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\u306F\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u305F\u3081\u3001\u59D4\u8B72\u3067\u304D\u307E\u305B\u3093\u3002
delegation.notAuthorizedonSuspend.message = \u59D4\u8B72\u3059\u308B\u6A29\u9650\u304C\u3042\u308A\u307E\u305B\u3093\u3002 {0}
+delegation.cantDelegateCase.message=+Cannot delegate Case Activity.
+delegation.selectOnlyCase.message=+Please select Case Process to change owner.
delegation.select.toggleLinkText = \u30D1\u30FC\u30C6\u30A3\u30B7\u30D1\u30F3\u30C8\u3092\u691C\u7D22
delegation.applyButton.text = OK
delegation.noParticipantSelected.message = \u30D1\u30FC\u30C6\u30A3\u30B7\u30D1\u30F3\u30C8\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
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 1a9cbfe..945461c 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
@@ -643,6 +643,8 @@ delegation.note.label = \u5907\u6CE8
delegation.tooltip.title = \u59D4\u6D3E
delegation.error = \u4E0D\u80FD\u59D4\u6258OID\u4E3A{0}\u7684\u6D3B\u52A8\uFF0C\u56E0\u4E3A\u8BE5\u6D3B\u52A8\u5728\u88AB\u6FC0\u6D3B\u72B6\u6001\u3002
delegation.notAuthorizedonSuspend.message = \u60A8\u6CA1\u6709\u6388\u6743\u59D4\u6258\u3002{0}
+delegation.cantDelegateCase.message=+Cannot delegate Case Activity.
+delegation.selectOnlyCase.message=+Please select Case Process to change owner.
delegation.select.toggleLinkText = \u641C\u7D22\u53C2\u4E0E\u8005
delegation.applyButton.text = \u53EF\u4EE5
delegation.noParticipantSelected.message = \u672A\u9009\u62E9\u4EFB\u4F55\u53C2\u4E0E\u8005\u3002