summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-12-13 08:46:29 (EST)
committerStephan Born2013-01-25 12:35:52 (EST)
commit7f889a6804bc1bac0da53af9ac8b7af7ec6e949c (patch)
tree466877b2ac9cabb52c7505549a3abbfdfe1f8cad
parentd53f70ac21e6e3df56a13c58f383b1a95a2e36bb (diff)
downloadorg.eclipse.stardust.ui.web-7f889a6804bc1bac0da53af9ac8b7af7ec6e949c.zip
org.eclipse.stardust.ui.web-7f889a6804bc1bac0da53af9ac8b7af7ec6e949c.tar.gz
org.eclipse.stardust.ui.web-7f889a6804bc1bac0da53af9ac8b7af7ec6e949c.tar.bz2
Jira-ID: CRNT-26580
- changes to adapt new IceFaces patch jar 1.8.2GA_P05 git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@61563 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml10
-rw-r--r--portal-common/etc/icefaces-ee-ivy-conf.xml6
2 files changed, 9 insertions, 7 deletions
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
index 2ec79f5..6c6efae 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/processOverviewViewColumns.xhtml
@@ -29,7 +29,7 @@
<f:param name="selectedCriticalForDetails" value="#{false}" />
</ice:commandLink>
</ice:panelGroup>
- <ice:panelGroup rendered="#{col.columnName == 'criticalHighPriority'}">
+ <ice:panelGroup rendered="#{col.columnName == 'criticalHighPriority'}">
<ice:commandLink value="#{row.criticalHighPriority}"
actionListener="#{row.doPriorityAction}"
disabled="#{(row.criticalHighPriority eq 0) ? true : false}"
@@ -91,7 +91,7 @@
title="#{(row.totalPriority eq 0) ? null: row.title}">
<pc:automationTag value="auto-BCC-ProcMgr-PrioDataTable-Total"
standAlone="false" />
- <f:param name="selectedPriorityForDetails" value="#{null}" />
+ <f:param name="selectedPriorityForDetails" value="" />
<f:param name="selectedCriticalForDetails" value="#{false}" />
</ice:commandLink>
</ice:panelGroup>
@@ -102,13 +102,15 @@
title="#{(row.criticalTotalPriority eq 0) ? null: row.title}">
<pc:automationTag value="auto-BCC-ProcMgr-PrioDataTable-CritTotal"
standAlone="false" />
- <f:param name="selectedPriorityForDetails" value="#{null}" />
+ <f:param name="selectedPriorityForDetails" value="" />
<f:param name="selectedCriticalForDetails" value="#{true}" />
</ice:commandLink>
</ice:panelGroup>
+
<ice:panelGroup rendered="#{col.columnName == 'PerformerName'}">
<ice:outputText value="#{row.defaultPerformerName}" />
</ice:panelGroup>
+
</ice:panelGroup>
-
+
</f:view> \ No newline at end of file
diff --git a/portal-common/etc/icefaces-ee-ivy-conf.xml b/portal-common/etc/icefaces-ee-ivy-conf.xml
index cf0fc9f..8056bb2 100644
--- a/portal-common/etc/icefaces-ee-ivy-conf.xml
+++ b/portal-common/etc/icefaces-ee-ivy-conf.xml
@@ -23,7 +23,7 @@
<publications/>
<dependencies>
- <dependency org="org.icefaces" name="icefaces-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">
+ <dependency org="org.icefaces" name="icefaces-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">
<exclude org="javax.faces" module="jsf-api" />
<exclude org="javax.faces" module="jsf-impl" />
<exclude org="commons-logging" module="commons-logging-api"/>
@@ -37,10 +37,10 @@
<exclude org="avalon-framework" module="avalon-framework" />
<exclude org="log4j" module="log4j" />
</dependency>
- <dependency org="org.icefaces" name="icefaces-comps-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">
+ <dependency org="org.icefaces" name="icefaces-comps-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">
<exclude org="org.icefaces" module="icefaces-ee" />
</dependency>
- <dependency org="org.icefaces" name="icefaces-facelets-ee" rev="EE-1.8.2.GA_P04" conf="icefaces->default">
+ <dependency org="org.icefaces" name="icefaces-facelets-ee" rev="EE-1.8.2.GA_P05" conf="icefaces->default">
<exclude org="org.icefaces" module="icefaces-ee" />
</dependency>
</dependencies>