summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-08-27 06:37:09 (EDT)
committer Stephan Born2013-09-23 05:02:38 (EDT)
commit56125bda33be954419b892ad5e5f03b2ba1d6cce (patch)
tree2d88cb63a5da8b6fc883a5c93a073312315e1fe1
parentd042142a66d6d79fb1bb2821fa3f2c83876de8c3 (diff)
downloadorg.eclipse.stardust.ui.web-56125bda33be954419b892ad5e5f03b2ba1d6cce.zip
org.eclipse.stardust.ui.web-56125bda33be954419b892ad5e5f03b2ba1d6cce.tar.gz
org.eclipse.stardust.ui.web-56125bda33be954419b892ad5e5f03b2ba1d6cce.tar.bz2
Jira-ID: CRNT-29965
Removed renderPortalSession from ActivityPanelController.openProcessDetail(). Removed renderPortalSession from PortalApplication.openOverflowView git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@66962 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/app/PortalApplication.java1
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityPanelController.java2
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/common/linkedProcessIframePopup.xhtml9
3 files changed, 7 insertions, 5 deletions
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
index a5e78aa..a91a5d4 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
@@ -441,7 +441,6 @@ public class PortalApplication
closeOverflowTabIframePopup();
}
- renderPortalSession();
}
/**
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityPanelController.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityPanelController.java
index 507ef56..4363c56 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityPanelController.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityPanelController.java
@@ -542,8 +542,6 @@ public class ActivityPanelController extends UIComponentBean
linkedProcess.openProcessDetial();
// Close the current Iframe
activityDetailsBean.closeLinkedProcessIframePopup();
- activityDetailsBean.renderSession();
-
}
/**
*
diff --git a/views-common/src/main/resources/META-INF/xhtml/common/linkedProcessIframePopup.xhtml b/views-common/src/main/resources/META-INF/xhtml/common/linkedProcessIframePopup.xhtml
index 58a6991..1ca2490 100644
--- a/views-common/src/main/resources/META-INF/xhtml/common/linkedProcessIframePopup.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/common/linkedProcessIframePopup.xhtml
@@ -62,6 +62,11 @@
}
}
}
+
+ function closeLinkedProcessIframe()
+ {
+ window.setTimeout(function() {parent.BridgeUtils.View.syncActiveView();},200);
+ }
</script>
</head>
<body style="width: 100%; height: 100%; background-color: #F7F7F7;"
@@ -77,7 +82,7 @@
<ice:panelGroup>
<ice:panelGrid columns="1">
<ice:commandLink styleClass="action-link"
- action="#{ippActivityPanelController.openProcessDetail}">
+ action="#{ippActivityPanelController.openProcessDetail}" onclick="closeLinkedProcessIframe();">
<pc:automationTag value="auto-PP-LinkedProcDlg-SwitchProcess" />
<ice:panelGrid columns="2">
<ice:graphicImage
@@ -100,7 +105,7 @@
<ice:panelGroup>
<ice:panelGrid columns="1">
<ice:commandLink styleClass="action-link"
- action="#{ippActivityPanelController.openProcessDetail}">
+ action="#{ippActivityPanelController.openProcessDetail}" onclick="closeLinkedProcessIframe();">
<pc:automationTag value="auto-PP-LinkedProcDlg-JoinProcess" />
<ice:panelGrid columns="2">
<ice:graphicImage