summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-07-24 08:14:43 (EDT)
committerStephan Born2013-09-23 04:55:38 (EDT)
commitd2bc42741c6f17de37c47782d1b3bcffbcf5791f (patch)
tree5f7eb93fb6c980b76cb55401a411d4b2061c6f59
parent9fe540016a7ff10ced8b0f352b4c7015259a6b65 (diff)
downloadorg.eclipse.stardust.ui.web-d2bc42741c6f17de37c47782d1b3bcffbcf5791f.zip
org.eclipse.stardust.ui.web-d2bc42741c6f17de37c47782d1b3bcffbcf5791f.tar.gz
org.eclipse.stardust.ui.web-d2bc42741c6f17de37c47782d1b3bcffbcf5791f.tar.bz2
Jira-ID: CRNT-29685
-Changed the path of "InfinityBpm.ProcessPortal.closeContentFrame" js call from ActivityDetailsBean.closeProcessAttachmentsIframePopupSelf() -Removed the call closeLinkedProcessIframePopupSelf() from ActivityDetailsBean.uploadProcessAttachment() and added to startFileUpload() git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@66231 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.java4
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/view/ActivityPanelController.java4
2 files changed, 4 insertions, 4 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 878ccc9..0402138 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
@@ -2482,9 +2482,9 @@ public class ActivityDetailsBean extends UIComponentBean
if (processAttachmentsPopupOpened)
{
String iFrameId = getProcessAttachmentsIframePopupId();
- String script = "parent.ippPortalMain.InfinityBpm.ProcessPortal.closeContentFrame(" + iFrameId + ");";
+ String script = "InfinityBpm.ProcessPortal.closeContentFrame(" + iFrameId + ");";
- JavascriptContext.addJavascriptCall(FacesContext.getCurrentInstance(), script);
+ PortalApplication.getInstance().addEventScript(script);
processAttachmentsPopupOpened = false;
}
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 f211b2e..77bfdc0 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
@@ -347,7 +347,6 @@ public class ActivityPanelController extends UIComponentBean
propsBean.getParamString("common.uploadIntoFolder",
propsBean.getString("views.processInstanceDetailsView.processDocumentTree.processAttachment")));
// Close the current Process Attachment Iframe.
- activityDetailsBean.closeProcessAttachmentsIframePopupSelf();
startFileUpload(documentUploadHelper);
documentUploadHelper.uploadFile();
}
@@ -389,6 +388,8 @@ public class ActivityPanelController extends UIComponentBean
}
});
uploadHelper.uploadFile();
+ activityDetailsBean.closeProcessAttachmentsIframePopupSelf();
+ activityDetailsBean.renderSession();
}
/**
@@ -420,7 +421,6 @@ public class ActivityPanelController extends UIComponentBean
if (DocumentUploadEventType.DIALOG_OPENED == eventType)
{
activityDetailsBean.closeProcessAttachmentsIframePopupSelf();
- activityDetailsBean.renderSession();
}
if (DocumentUploadEventType.DOCUMENT_CREATED == eventType)
{