summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-08-23 07:49:26 (EDT)
committerStephan Born2013-09-23 05:02:10 (EDT)
commit32bd643fef5b01503c0c704e8df5a5290140622d (patch)
tree655affe24857056a99669b22b0b5601fd1e164e1
parentd9ee127dd383757f573ff62eeb2f6de4f5d87d47 (diff)
downloadorg.eclipse.stardust.ui.web-32bd643fef5b01503c0c704e8df5a5290140622d.zip
org.eclipse.stardust.ui.web-32bd643fef5b01503c0c704e8df5a5290140622d.tar.gz
org.eclipse.stardust.ui.web-32bd643fef5b01503c0c704e8df5a5290140622d.tar.bz2
Jira-ID: CRNT-29965
Removed renderSession calls from ActivityPanel toolbar where Iframe opens git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@66920 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityDetailsBean.java9
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityPanelController.java8
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml10
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml14
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/suspendActivityIframePopup.xhtml9
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/common/abortIframePopup.xhtml10
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/common/caseIframePopup.xhtml10
7 files changed, 43 insertions, 27 deletions
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 fd28b14..c9272ef 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
@@ -1072,7 +1072,6 @@ public class ActivityDetailsBean extends UIComponentBean
params.put("noteIndex", noteIndex);
openNotesView(params);
closeNotesIframePopupSelf();
- renderSession();
}
/**
@@ -1227,7 +1226,6 @@ public class ActivityDetailsBean extends UIComponentBean
{
closeSuspendActivityIframePopup();
processActivityInstance(WorkflowAction.SUSPEND_TO_USER_WORKLIST);
- renderSession();
}
/**
@@ -1237,7 +1235,6 @@ public class ActivityDetailsBean extends UIComponentBean
{
closeSuspendActivityIframePopup();
processActivityInstance(WorkflowAction.SUSPEND_TO_DEFAULT_PERFORMER);
- renderSession();
}
/**
@@ -3024,7 +3021,6 @@ public class ActivityDetailsBean extends UIComponentBean
createCaseDialog.setSourceProcessInstances(selectedProcesses);
createCaseDialog.openPopup();
closeCaseIframePopup();
- renderSession();
}
@@ -3048,8 +3044,6 @@ public class ActivityDetailsBean extends UIComponentBean
attachToCaseDialog.setSourceProcessInstances(selectedProcesses);
attachToCaseDialog.openPopup();
closeCaseIframePopup();
-
- renderSession();
}
/**
@@ -3076,8 +3070,6 @@ public class ActivityDetailsBean extends UIComponentBean
}
}
});
-
- renderSession();
}
/**
@@ -3103,7 +3095,6 @@ public class ActivityDetailsBean extends UIComponentBean
}
});
- renderSession();
}
public boolean isEnableJoinProcess()
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 77bfdc0..507ef56 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
@@ -323,7 +323,6 @@ public class ActivityPanelController extends UIComponentBean
DocumentViewUtil.openJCRDocument(docInfo.getId(), params);
activityDetailsBean.closeProcessAttachmentsIframePopupSelf();
- activityDetailsBean.renderSession();
}
else
{
@@ -389,7 +388,6 @@ public class ActivityPanelController extends UIComponentBean
});
uploadHelper.uploadFile();
activityDetailsBean.closeProcessAttachmentsIframePopupSelf();
- activityDetailsBean.renderSession();
}
/**
@@ -406,8 +404,8 @@ public class ActivityPanelController extends UIComponentBean
//update document in process instance
DMSHelper.addAndSaveProcessAttachment(processInstance, document);
DocumentViewUtil.openJCRDocument(document.getId());
-
- activityDetailsBean.closeProcessAttachmentsIframePopupSelf();
+
+ activityDetailsBean.closeProcessAttachmentsIframePopup();
activityDetailsBean.renderSession();
}
@@ -579,7 +577,7 @@ public class ActivityPanelController extends UIComponentBean
ProcessInstance fromProcessLink = ProcessInstanceUtils.getLinkInfo(processInstance, LinkDirection.TO,
PredefinedProcessInstanceLinkTypes.SWITCH);
ProcessInstance joinProcessLink = ProcessInstanceUtils.getLinkInfo(processInstance, LinkDirection.TO,
- PredefinedProcessInstanceLinkTypes.JOIN);
+ PredefinedProcessInstanceLinkTypes.JOIN);
linkedProcess = LinkedProcessBean.getCurrent();
linkedProcess.setFromLinkedProcess(fromProcessLink);
linkedProcess.setJoinLinkedProcess(joinProcessLink);
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
index f81d2a0..597d6fb 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
@@ -62,6 +62,12 @@
}
}
}
+
+ function closeNotesIframe()
+ {
+ window.setTimeout(function() {parent.BridgeUtils.View.syncActiveView();},200);
+ }
+
</script>
</head>
<body style="width: 100%; height:100%; background-color: #F7F7F7;" onLoad="if(windowLoaded){windowLoaded()}">
@@ -69,7 +75,7 @@
<ice:panelGroup style="background-color: #EAEAEA;">
<ice:panelGrid columns="1"> <!-- Added to give same spacing -->
<ice:commandLink styleClass="action-link"
- actionListener="#{activityDetailsBean.openNotes}">
+ actionListener="#{activityDetailsBean.openNotes}" immediate="true" onclick="closeNotesIframe();">
<pc:automationTag value="auto-PP-NotesView-ActionsNew"/>
<f:param name="createNote" value="true" />
<ice:panelGrid columns="2">
@@ -85,7 +91,7 @@
value="#{ippActivityPanelController.notes}" var="note" varStatus="noteIndex">
<ice:panelGrid columns="1"> <!-- Added to give same spacing -->
<ice:commandLink styleClass="action-link"
- actionListener="#{activityDetailsBean.openNotes}">
+ actionListener="#{activityDetailsBean.openNotes}" immediate="true" onclick="closeNotesIframe();">
<pc:automationTag value="auto-PP-NotesView-ActionsOpen" />
<f:attribute name="noteTimestamp" value="#{note.timeStampAsDate}" />
<f:attribute name="noteIndex" value="${noteIndex.index}" />
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml
index 0a320e2..bd6721a 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/processAttachmentsIframePopup.xhtml
@@ -62,6 +62,11 @@
}
}
}
+
+ function closeIframe()
+ {
+ window.setTimeout(function(){parent.BridgeUtils.View.syncActiveView();parent.BridgeUtils.View.syncLaunchPanels();},200);
+ }
</script>
</head>
<body style="width: 100%; height:100%; background-color: #F7F7F7;" onLoad="if(windowLoaded){windowLoaded()}">
@@ -69,7 +74,7 @@
<ice:panelGroup rendered="#{ippActivityPanelController.supportsProcessAttachments}" style="background-color: #EAEAEA;">
<ice:panelGrid columns="1" > <!-- Added to give same spacing -->
<ice:commandLink styleClass="action-link"
- action="#{ippActivityPanelController.uploadProcessAttachment}">
+ action="#{ippActivityPanelController.uploadProcessAttachment}" immediate="true" onclick="closeIframe();">
<pc:automationTag value="auto-PP-ProcAttachDlg-ToolbarUpload" />
<ice:panelGrid columns="2">
<ice:graphicImage value="/plugins/views-common/images/icons/page_white_get.png" />
@@ -78,7 +83,7 @@
</ice:panelGrid>
</ice:commandLink>
<ice:commandLink styleClass="action-link"
- action="#{ippActivityPanelController.createDocument}">
+ action="#{ippActivityPanelController.createDocument}" immediate="true" partialSubmit="true" onclick="closeIframe();">
<pc:automationTag value="auto-PP-ProcAttachDlg-ToolbarCreate"/>
<f:param name="folderId"
value="#{ippActivityPanelController.processAttachmentsFolderId}" />
@@ -96,7 +101,7 @@
value="#{ippActivityPanelController.processDocuments}" var="processDocument">
<ice:panelGrid columns="1"> <!-- Added to give same spacing -->
<ice:commandLink styleClass="action-link"
- actionListener="#{ippActivityPanelController.openDocument}">
+ actionListener="#{ippActivityPanelController.openDocument}" immediate="true" onclick="closeIframe();">
<pc:automationTag value="auto-PP-ProcAttachDlg-ToolbarOpenNewDocument" />
<f:attribute name="documentInfo" value="#{processDocument}" />
<ice:panelGrid columns="2">
@@ -111,7 +116,7 @@
value="#{ippActivityPanelController.processAttachments}" var="processAttachment">
<ice:panelGrid columns="1"> <!-- Added to give same spacing -->
<ice:commandLink styleClass="action-link"
- actionListener="#{ippActivityPanelController.openDocument}">
+ actionListener="#{ippActivityPanelController.openDocument}" immediate="true" onclick="closeIframe();">
<pc:automationTag value="auto-PP-ProcAttachDlg-ToolbarOpenAttachment" />
<f:attribute name="documentInfo" value="#{processAttachment}" />
<ice:panelGrid columns="2">
@@ -121,7 +126,6 @@
</ice:commandLink>
</ice:panelGrid>
</ice:panelSeries>
-
</ice:panelGroup>
</ice:form>
</body>
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/suspendActivityIframePopup.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/suspendActivityIframePopup.xhtml
index b683f74..f5fadf8 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/suspendActivityIframePopup.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/suspendActivityIframePopup.xhtml
@@ -62,6 +62,11 @@
}
}
}
+
+ function closeSuspendActivityIframe()
+ {
+ window.setTimeout(function() {parent.BridgeUtils.View.syncLaunchPanels();},200);
+ }
</script>
</head>
<body style="width: 100%; height:100%; background-color: #F7F7F7;" onLoad="if(windowLoaded){windowLoaded()}">
@@ -70,14 +75,14 @@
<ice:panelGrid columns="1">
<!-- Added to give same spacing -->
<ice:commandLink styleClass="action-link"
- actionListener="#{activityDetailsBean.suspendToUserWorklistAction}">
+ actionListener="#{activityDetailsBean.suspendToUserWorklistAction}" immediate="true" onclick="closeSuspendActivityIframe();">
<ice:panelGrid columns="2" style="margin-left:2px;">
<ice:outputText style="white-space: nowrap;"
value="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.suspendPrivateWorklist']}" />
</ice:panelGrid>
</ice:commandLink>
<ice:commandLink styleClass="action-link"
- actionListener="#{activityDetailsBean.suspendToDefaultPerformerAction}">
+ actionListener="#{activityDetailsBean.suspendToDefaultPerformerAction}" immediate="true" onclick="closeSuspendActivityIframe();">
<ice:panelGrid columns="2" style="margin-left:2px;">
<ice:outputText style="white-space: nowrap;"
value="#{processportal_msgPropsBean['toolbars.workflowActions.tooltip.suspendDefPerformer']}" />
diff --git a/views-common/src/main/resources/META-INF/xhtml/common/abortIframePopup.xhtml b/views-common/src/main/resources/META-INF/xhtml/common/abortIframePopup.xhtml
index 54d2dc6..70c4656 100644
--- a/views-common/src/main/resources/META-INF/xhtml/common/abortIframePopup.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/common/abortIframePopup.xhtml
@@ -62,6 +62,12 @@
}
}
}
+
+ function closeAbortMenuIframe()
+ {
+ window.setTimeout(function() {parent.BridgeUtils.View.syncActiveView();},200);
+ }
+
</script>
</head>
<body style="width: 100%; height:100%; background-color: #F7F7F7;" onLoad="if(windowLoaded){windowLoaded()}">
@@ -70,7 +76,7 @@
<ice:panelGrid columns="1">
<!-- Added to give same spacing -->
<ice:commandLink styleClass="action-link"
- actionListener="#{activityDetailsBean.openSwitchProcess}" disabled="#{!activityDetailsBean.enableSwitchProcess}" >
+ actionListener="#{activityDetailsBean.openSwitchProcess}" disabled="#{!activityDetailsBean.enableSwitchProcess}" immediate="true" onclick="closeAbortMenuIframe();">
<pc:automationTag value="auto-PP-ActivityPnl-ToolbarSwitchJoin-SwitchProc" />
<ice:panelGrid columns="2" style="margin-left:2px;" styleClass="#{activityDetailsBean.enableSwitchProcess?'':'iceCmdBtn-dis'} ">
<ice:outputText style="white-space: nowrap;"
@@ -78,7 +84,7 @@
</ice:panelGrid>
</ice:commandLink>
<ice:commandLink styleClass="action-link"
- actionListener="#{activityDetailsBean.openJoinProcess}" disabled="#{!activityDetailsBean.enableJoinProcess}">
+ actionListener="#{activityDetailsBean.openJoinProcess}" disabled="#{!activityDetailsBean.enableJoinProcess}" immediate="true" onclick="closeAbortMenuIframe();">
<pc:automationTag value="auto-PP-ActivityPnl-ToolbarSwitchJoin-JoinProc" />
<ice:panelGrid columns="1" style="margin-left:2px;" styleClass="#{activityDetailsBean.enableJoinProcess?'':'iceCmdBtn-dis'} ">
<ice:outputText style="white-space: nowrap;"
diff --git a/views-common/src/main/resources/META-INF/xhtml/common/caseIframePopup.xhtml b/views-common/src/main/resources/META-INF/xhtml/common/caseIframePopup.xhtml
index b5ec0c4..c4f1911 100644
--- a/views-common/src/main/resources/META-INF/xhtml/common/caseIframePopup.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/common/caseIframePopup.xhtml
@@ -62,6 +62,12 @@
}
}
}
+
+ function closeCaseIframe()
+ {
+ window.setTimeout(function() {parent.BridgeUtils.View.syncActiveView();},200);
+ }
+
</script>
</head>
<body style="width: 100%; height:100%; background-color: #F7F7F7;" onLoad="if(windowLoaded){windowLoaded()}">
@@ -70,7 +76,7 @@
<ice:panelGrid columns="1">
<!-- Added to give same spacing -->
<ice:commandLink styleClass="action-link"
- actionListener="#{activityDetailsBean.openAttachToCase}">
+ actionListener="#{activityDetailsBean.openAttachToCase}" immediate="true" onclick="closeCaseIframe();">
<pc:automationTag
value="auto-PP-ActivityPnl-ToolbarCase-AttachCase" />
<ice:panelGrid columns="2" style="margin-left:2px;">
@@ -88,7 +94,7 @@
<!-- Create Case with permission -->
<ice:commandLink styleClass="action-link"
actionListener="#{activityDetailsBean.openCreateCase}"
- rendered="#{activityDetailsBean.enableCreateCase}">
+ rendered="#{activityDetailsBean.enableCreateCase}" immediate="true" onclick="closeCaseIframe();">
<pc:automationTag
value="auto-PP-ActivityPnl-ToolbarCase-CreateCase" />
<ice:panelGrid columns="1" style="margin-left:2px;">