summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-05-15 05:31:26 (EDT)
committerManik Kishore2012-06-19 07:29:46 (EDT)
commitc4deafd7d759323b13a63b33ed5c3c40ac81e997 (patch)
treec2564407798b97ea71d6d0928b3d47e342f1691b
parenta8355bfad6905363ab6f10acf305728c0d6090f4 (diff)
downloadorg.eclipse.stardust.ui.web-c4deafd7d759323b13a63b33ed5c3c40ac81e997.zip
org.eclipse.stardust.ui.web-c4deafd7d759323b13a63b33ed5c3c40ac81e997.tar.gz
org.eclipse.stardust.ui.web-c4deafd7d759323b13a63b33ed5c3c40ac81e997.tar.bz2
Jira-ID: CRNT-24549
-Excluded Case Activity from delegateToDefaultPerformer() in UserManagementBean.java -Added code to show Error dialog in performDefaultDelegation() method in ActivityTableHelper.java -Added style to disable Default delegation icon in activityTableColumns.xhtml git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@56339 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java5
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java10
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml1
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml2
4 files changed, 15 insertions, 3 deletions
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java
index ebae915..e9312e2 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/UserManagementBean.java
@@ -348,7 +348,10 @@ public class UserManagementBean extends PopupUIComponentBean
{
for (ActivityInstance ai : activityInstances)
{
- ais.add(ai);
+ if (!ActivityInstanceUtils.isDefaultCaseActivity(ai))
+ {
+ ais.add(ai);
+ }
}
}
ActivityInstanceUtils.delegateToDefaultPerformer(ais);
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java
index 3e2fe5a..b144f0a 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/activityTable/ActivityTableHelper.java
@@ -1007,8 +1007,16 @@ public class ActivityTableHelper implements ICallbackHandler , IUserObjectBuilde
}
}
}
- if (ais != null)
+ if (CollectionUtils.isNotEmpty(ais))
{
+ boolean isCaseActivities = ActivityInstanceUtils.isContainsCaseActivity(ais);
+ if (isCaseActivities)
+ {
+ MessageDialog.addErrorMessage(MessagesViewsCommonBean.getInstance().getString(
+ "views.switchProcessDialog.caseAbort.message"));
+ return;
+ }
+
ActivityInstanceUtils.delegateToDefaultPerformer(ais);
getCallbackHandler().handleEvent(EventType.APPLY);
}
diff --git a/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml
index 3d43072..f73f6f7 100644
--- a/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableColumns.xhtml
@@ -133,6 +133,7 @@
<ice:graphicImage
url="/plugins/views-common/images/icons/user-silhouette.png"
style="border:none;"
+ styleClass="#{!row.caseInstance ? '' : 'iceCmdBtn-dis'}"
title="#{messages_bcc['views.strandedActivities.toolTip.delegateToDefaultPerformer']}" />
</ice:commandLink>
<ice:commandLink actionListener="#{bean.openDelegateDialog}" disabled="#{!row.delegable or row.caseInstance}">
diff --git a/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml
index f87c280..c66cacf 100644
--- a/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/activityTableHelper/activityTableHelperToolbar.xhtml
@@ -55,7 +55,7 @@
<ice:panelConfirmation id="delegateToDefaultPerformer"
title="#{views_common_msgPropsBean['common.confirm']}"
message="#{views_common_msgPropsBean['common.confirmDefaultDelegate']}"
- acceptLabel="#{views_common_msgPropsBean['common.yes']}" cancelLabel="#{views_common_msgPropsBean['common.no']}">
+ acceptLabel="#{views_common_msgPropsBean['common.yes']}" cancelLabel="#{views_common_msgPropsBean['common.no']}" style="width:auto;">
<pc:automationTag value="auto-COM-ActivityTbl-ToolbarDelegateConfMsg" standAlone="false" requiredValue="pnlConfirmation" />
</ice:panelConfirmation>