summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Mishra2012-03-09 05:07:25 (EST)
committer Manik Kishore2012-06-19 07:20:09 (EDT)
commitfd9654b8abb1b6f5c64b569a3e9ea9001cb4df01 (patch)
tree8472e270be6c2df6c5201ef42a810c9a09778001
parent028388daac78bd3e385741c92e2707ab6b8ab3ae (diff)
downloadorg.eclipse.stardust.ui.web-fd9654b8abb1b6f5c64b569a3e9ea9001cb4df01.zip
org.eclipse.stardust.ui.web-fd9654b8abb1b6f5c64b569a3e9ea9001cb4df01.tar.gz
org.eclipse.stardust.ui.web-fd9654b8abb1b6f5c64b569a3e9ea9001cb4df01.tar.bz2
Jira-ID: CRNT-23440
1)hiding icon instead of disable. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54422 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml4
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java2
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/casemanagement/CaseDetailsBean.java1
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml4
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml4
5 files changed, 8 insertions, 7 deletions
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
index 64a324d..be05506 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/workflowActions.xhtml
@@ -155,10 +155,10 @@
value="processInstanceOID=#{activityDetailsBean.activityInstance.processInstanceOID}&processInstanceName=#{activityDetailsBean.activityInstance.processInstance.processName}" />
</ice:commandLink>
- <ice:commandLink action="#{spawnProcessDialogBean.openPopup}" disabled="#{!activityDetailsBean.enableSpawnProcess}" immediate="true" >
+ <ice:commandLink action="#{spawnProcessDialogBean.openPopup}" rendered="#{activityDetailsBean.enableSpawnProcess}" immediate="true" >
<ice:graphicImage
value="/plugins/views-common/images/icons/cog_add.png"
- styleClass="toolbar-button #{activityDetailsBean.enableSpawnProcess ? 'iceCmdBtn-dis' : ''}"
+ styleClass="toolbar-button #{activityDetailsBean.enableSpawnProcess ? '': 'iceCmdBtn-dis'}"
title="#{views_common_msgPropsBean['views.spawnProcessDialog.title']}" />
<f:param name="processInstanceOID"
value="#{activityDetailsBean.activityInstance.processInstanceOID}" />
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java
index 43bb66b..a90fc4d 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/processContextExplorer/ProcessInstanceDetailsBean.java
@@ -219,7 +219,7 @@ public class ProcessInstanceDetailsBean extends PopupUIComponentBean
}
}
}
-
+ initializePermissions();
}
}
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 e43b5c2..72fb475 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
@@ -548,6 +548,7 @@ public class CaseDetailsBean extends PopupUIComponentBean
public void update()
{
initialize();
+ initializePermissions();
}
/**
diff --git a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
index 2dfd68f..d6f6a44 100644
--- a/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/extension/toolbar/processInstanceDetailsViewToolbar.xhtml
@@ -44,8 +44,8 @@
<ui:param name="bean" value="#{bean}" />
</ice:panelGroup>
- <ice:commandLink action="#{spawnProcessDialogBean.openPopup}"
- immediate="true" disabled="#{!processInstanceDetailsBean.abortProcess or !processInstanceDetailsBean.enableSpawnProcess}">
+ <ice:commandLink action="#{spawnProcessDialogBean.openPopup}" rendered="#{processInstanceDetailsBean.enableSpawnProcess}"
+ immediate="true" disabled="#{!processInstanceDetailsBean.abortProcess}">
<pc:automationTag value="auto-COM-PCESpawnProcess" standAlone="false" />
<ice:graphicImage
value="/plugins/views-common/images/icons/cog_add.png"
diff --git a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
index b072a10..e511c39 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processhistory/processInstanceHistoryTableColumns.xhtml
@@ -123,8 +123,8 @@
</ice:commandLink>
<ice:commandLink
actionListener="#{processHistoryTable.openSpawnProcess}"
- rendered="#{!processHistoryTable.enableCase}"
- disabled="#{!processHistoryTable.enableSpawnProcess or not row.enableTerminate}">
+ rendered="#{processHistoryTable.enableSpawnProcess and !processHistoryTable.enableCase}"
+ disabled="#{not row.enableTerminate}">
<pc:automationTag value="auto-COM-PCEHistoryTable-ActionsSpawn" standAlone="false"/>
<ice:graphicImage
value="/plugins/views-common/images/icons/cog_add.png"