summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-08-12 05:55:18 (EDT)
committerStephan Born2013-09-23 04:59:40 (EDT)
commit7b136fec43d834b5e71248230586af44e4d75b22 (patch)
tree099f800c9522a84a1485a2fb80be992cdd3014fc
parent1a771f6cea60d6edfcee81ebb1e28affc65e7a5c (diff)
downloadorg.eclipse.stardust.ui.web-7b136fec43d834b5e71248230586af44e4d75b22.zip
org.eclipse.stardust.ui.web-7b136fec43d834b5e71248230586af44e4d75b22.tar.gz
org.eclipse.stardust.ui.web-7b136fec43d834b5e71248230586af44e4d75b22.tar.bz2
Jira-ID: CRNT-29635
Added call to BridgeUtils.syncActiveView when view close is successfull from viewClosing(event). git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@66629 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/SingleViewLaunchPanels.java6
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityDetailsBean.java7
2 files changed, 11 insertions, 2 deletions
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/SingleViewLaunchPanels.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/SingleViewLaunchPanels.java
index c39d5bb..d05bbd7 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/SingleViewLaunchPanels.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/SingleViewLaunchPanels.java
@@ -102,7 +102,7 @@ public class SingleViewLaunchPanels implements InitializingBean
PortalApplication portalApp = PortalApplication.getInstance();
String value = (String)event.getNewValue();
- trace.error("Closing view: " + value);
+ trace.info("Closing view: " + value);
if (StringUtils.isNotEmpty(value))
{
@@ -117,6 +117,8 @@ public class SingleViewLaunchPanels implements InitializingBean
trace.info("Before:: View Count: " + portalApp.getOpenViewsSize());
portalApp.closeView(view);
trace.info("After:: View Count: " + portalApp.getOpenViewsSize());
+ // After succesfull view close, sync active view
+ portalApp.addEventScript("parent.BridgeUtils.View.syncActiveView();");
String sessionId = SessionRendererHelper.getPortalSessionRendererId(portalApp.getLoggedInUser());
sessionId += view.getIdentityParams();
@@ -125,7 +127,7 @@ public class SingleViewLaunchPanels implements InitializingBean
}
else
{
- trace.error("Could not close view: " + value);
+ trace.info("Could not close view: " + value);
// Unexpected Situation! View is not open at IPP, but it's open on UI at HTML5 Framework.
// Fire JS for it's closing. It might be internal/native or external view
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityDetailsBean.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityDetailsBean.java
index 33efc70..fd28b14 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityDetailsBean.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityDetailsBean.java
@@ -1322,6 +1322,8 @@ public class ActivityDetailsBean extends UIComponentBean
skipViewEvents = true;
// TODO move to controller?
PortalApplication.getInstance().closeView(thisView, true);
+ // When view close is auto-operation, sync view is required to update focus view
+ PortalApplication.getInstance().addEventScript("parent.BridgeUtils.View.syncActiveView();");
skipViewEvents = false;
}
}
@@ -1411,6 +1413,7 @@ public class ActivityDetailsBean extends UIComponentBean
skipViewEvents = true;
// TODO move to controller?
PortalApplication.getInstance().closeView(thisView, true);
+ PortalApplication.getInstance().addEventScript("parent.BridgeUtils.View.syncActiveView();");
skipViewEvents = false;
}
}
@@ -1813,6 +1816,10 @@ public class ActivityDetailsBean extends UIComponentBean
else
{
PortalApplication.getInstance().closeView(thisView, true);
+ if(null == nextActivityObject)
+ {
+ PortalApplication.getInstance().addEventScript("parent.BridgeUtils.View.syncActiveView();");
+ }
}
if (completionLog.isSuccess())