summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-05-08 09:36:38 (EDT)
committerStephan Born2013-05-08 09:36:38 (EDT)
commit4c8c22086d1917554f2a971ac38d6f073af28781 (patch)
treeaeb34529f9f4d943e2a77a40cb3dba75cd9bb399
parent10baafd778c2ec3eb287a7788755f53a9f6fc11e (diff)
downloadorg.eclipse.stardust.ui.web-4c8c22086d1917554f2a971ac38d6f073af28781.zip
org.eclipse.stardust.ui.web-4c8c22086d1917554f2a971ac38d6f073af28781.tar.gz
org.eclipse.stardust.ui.web-4c8c22086d1917554f2a971ac38d6f073af28781.tar.bz2
Jira-ID: CRNT-29016
Used FacesContext.getExternalContext().encodeResourceURL inplace of response.encodeURL() for ExternalWebAppActivityInteractionController panelURI Reverted the change done on CommonFileUploadDialog.fireCallback by moving closePopUp before event handling. Added code to closeProcessAttachmentsIframePopupSelf() from ActivityPanelController.uploadProcessAttachment git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@64776 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/ActivityPanelController.java2
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/controller/ExternalWebAppActivityInteractionController.java7
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java6
3 files changed, 7 insertions, 8 deletions
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 9539d70..9036106 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
@@ -346,6 +346,8 @@ public class ActivityPanelController extends UIComponentBean
documentUploadHelper.getFileUploadDialogAttributes().setHeaderMessage(
propsBean.getParamString("common.uploadIntoFolder",
propsBean.getString("views.processInstanceDetailsView.processDocumentTree.processAttachment")));
+ // Close the current Process Attachment Iframe.
+ activityDetailsBean.closeProcessAttachmentsIframePopupSelf();
startFileUpload(documentUploadHelper);
documentUploadHelper.uploadFile();
}
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/controller/ExternalWebAppActivityInteractionController.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/controller/ExternalWebAppActivityInteractionController.java
index b508873..4ffb5b8 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/controller/ExternalWebAppActivityInteractionController.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/controller/ExternalWebAppActivityInteractionController.java
@@ -164,8 +164,7 @@ public class ExternalWebAppActivityInteractionController implements IActivityInt
FacesContext fc = FacesContext.getCurrentInstance();
HttpServletRequest req = (HttpServletRequest) fc.getExternalContext().getRequest();
- HttpServletResponse resp = (HttpServletResponse) fc.getExternalContext().getResponse();
-
+
// allow base URI override via parameter
String servicesBaseUri = fc.getExternalContext().getInitParameter("InfinityBpm.ServicesBaseUri");
if (isEmpty(servicesBaseUri))
@@ -221,8 +220,8 @@ public class ExternalWebAppActivityInteractionController implements IActivityInt
uriBuilder.append("&") //
.append(PARAM_SERVICES_BASE_URI).append("=").append(servicesBaseUri);
-
- return resp.encodeURL(uriBuilder.toString());
+
+ return fc.getExternalContext().encodeResourceURL(uriBuilder.toString());
}
public boolean closePanel(ActivityInstance ai, ClosePanelScenario scenario)
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java
index 7fd3ead..0bb0198 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java
@@ -140,6 +140,8 @@ public class CommonFileUploadDialog extends PopupUIComponentBean
*/
private void fireCallback(FileUploadEvent eventType, FileInfo fileInfo)
{
+ closePopup();
+
if (callbackHandler != null)
{
FileWrapper fileWrapper = new FileWrapper();
@@ -156,10 +158,6 @@ public class CommonFileUploadDialog extends PopupUIComponentBean
callbackHandler.handleEvent(eventType);
}
- // After file upload externalWebapp TO_BE_ACTIVATED failed with no context available
- // while closePopup, if called before callbachHandler handleEvent , kept closePopup
- // after event handling
- closePopup();
}
public int getFileUploadProgress()