diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index a28db7e..de68eea 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; +import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WS_UPLOAD_TYPE; import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation; import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEvent; @@ -938,7 +939,10 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt if(fileDownloadEvent.getItemName()!= null){ try { - new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET, ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, "id="+fileDownloadEvent.getItemIdentifier()+"&viewContent=true", "_blank", downloadHandlerCallback); + // Add currentContextId parameter + String currentContextId = GCubeClientContext.getCurrentContextId(); + String queryString = "id="+fileDownloadEvent.getItemIdentifier()+"&viewContent=true&"+ConstantsExplorer.CONTEXT_ID+"="+currentContextId; + new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET, ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, queryString, "_blank", downloadHandlerCallback); } catch (Exception e) { explorerPanel.getAsycTreePanel().unmask(); @@ -957,7 +961,10 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt else { try { - new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET,ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, "id="+fileDownloadEvent.getItemIdentifier(), "_self", downloadHandlerCallback); + // Add currentContextId parameter + String currentContextId = GCubeClientContext.getCurrentContextId(); + String queryString = "id="+fileDownloadEvent.getItemIdentifier()+"&"+ConstantsExplorer.CONTEXT_ID+"="+currentContextId; + new RequestBuilderWorkspaceValidateItem(RequestBuilder.GET,ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE, queryString, "_self", downloadHandlerCallback); } catch (Exception e) { explorerPanel.getAsycTreePanel().unmask(); new MessageBoxAlert("Error", e.getMessage(), null); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/util/RequestBuilderWorkspaceValidateItem.java b/src/main/java/org/gcube/portlets/user/workspace/client/util/RequestBuilderWorkspaceValidateItem.java index 4f023af..2dc9542 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/util/RequestBuilderWorkspaceValidateItem.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/util/RequestBuilderWorkspaceValidateItem.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.user.workspace.client.util; -import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.event.SessionExpiredEvent; @@ -64,10 +63,6 @@ public class RequestBuilderWorkspaceValidateItem { else httpQueryString +="&"+ConstantsExplorer.VALIDATEITEM+"=true"; - // Add hidden parameters - String currentContextId = GCubeClientContext.getCurrentContextId(); - httpQueryString+="&"+ConstantsExplorer.CONTEXT_ID+"="+currentContextId; - String urlRequest = servletName+"?"+httpQueryString; GWT.log("request builder for: "+urlRequest); @@ -99,7 +94,7 @@ public class RequestBuilderWorkspaceValidateItem { }else { //OK STATUS if(callback!=null) - callback.onSuccess(new WindowOpenParameter(targetWindow, "", httpQueryString, true, newBrowserWindow)); + callback.onSuccess(new WindowOpenParameter(targetWindow, "", params, true, newBrowserWindow)); } }