summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-07-08 05:24:14 (EDT)
committerStephan Born2013-08-29 05:03:52 (EDT)
commit561790a48224a892af3b8639f7d9ed1560dbeeda (patch)
treef998a82ed5764b0d6d8dae18f5ca16a6edb15d91
parent84af612a421e9e82e1162cd2b70cf7717a386c0a (diff)
downloadorg.eclipse.stardust.ui.web-561790a48224a892af3b8639f7d9ed1560dbeeda.zip
org.eclipse.stardust.ui.web-561790a48224a892af3b8639f7d9ed1560dbeeda.tar.gz
org.eclipse.stardust.ui.web-561790a48224a892af3b8639f7d9ed1560dbeeda.tar.bz2
Jira-ID: CRNT-28362
Added method openPopup in message/MessageDialog.java for setting 'fromlaunchPanels' for popUps opened from portalSingleViewLaunchPanelsOnly.xhtml Added panelGroup to include portalMessageDialog.xhtml in portalSingleViewLaunchPanelsOnly.xhtml git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@65871 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/message/MessageDialog.java17
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanelsOnly.xhtml4
2 files changed, 21 insertions, 0 deletions
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/message/MessageDialog.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/message/MessageDialog.java
index cc5f181..026af60 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/message/MessageDialog.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/message/MessageDialog.java
@@ -16,6 +16,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
+import javax.faces.context.FacesContext;
+
import org.eclipse.stardust.ui.web.common.app.PortalUiController;
import org.eclipse.stardust.ui.web.common.log.LogManager;
import org.eclipse.stardust.ui.web.common.log.Logger;
@@ -57,6 +59,20 @@ public class MessageDialog extends PopupDialog
modal = true;
}
+ public void openPopup()
+ {
+ String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
+ if (StringUtils.isNotEmpty(viewId))
+ {
+ if (viewId.endsWith("/portalSingleViewLaunchPanelsOnly.xhtml"))
+ {
+ fromlaunchPanels = true;
+ }
+ }
+
+ super.openPopup();
+ }
+
/**
* @return
*/
@@ -292,4 +308,5 @@ public class MessageDialog extends PopupDialog
{
return exception;
}
+
}
diff --git a/portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanelsOnly.xhtml b/portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanelsOnly.xhtml
index 2837ad4..1859aed 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanelsOnly.xhtml
+++ b/portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanelsOnly.xhtml
@@ -32,6 +32,10 @@
</head>
<body onload="init();">
<ui:include src="portalSingleViewLaunchPanels.xhtml" />
+ <ice:panelGroup
+ rendered="#{ippMessageDialog.fromlaunchPanels == 'true'}">
+ <ui:include src="portalMessageDialog.xhtml" />
+ </ice:panelGroup>
<div id="viewFormLPContainer">
<!-- Active View Handlers -->