diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java index d6e2719..df3a7ba 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java @@ -455,7 +455,7 @@ public interface Icons extends ClientBundle { /** * @return */ - @Source("icons/thredds.png") + @Source("icons/thredds.gif") ImageResource thredds(); } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/thredds.gif b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/thredds.gif new file mode 100644 index 0000000..5f39482 Binary files /dev/null and b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/thredds.gif differ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublishOnThredds.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublishOnThredds.java index 8d20220..0aa170c 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublishOnThredds.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublishOnThredds.java @@ -51,7 +51,7 @@ public class DialogPublishOnThredds extends Dialog { /** * */ - private int widthDialog = 500; + private int widthDialog = 550; private TextField txtCatalogueName; private TriggerField triggerFieldMetadataFolderName; private ComboBox selectVRE; @@ -118,8 +118,8 @@ public class DialogPublishOnThredds extends Dialog { private void initLayout() { FormLayout layout = new FormLayout(); - layout.setLabelWidth(120); - layout.setDefaultWidth(350); + layout.setLabelWidth(130); + layout.setDefaultWidth(370); setLayout(layout); setButtonAlign(HorizontalAlignment.CENTER); // setHideOnButtonClick(true); @@ -255,7 +255,7 @@ public class DialogPublishOnThredds extends Dialog { if(result.isTransferringReportAvailable()){ InfoDisplay.display("Transferring completed", "Refreshing folder content..."); FileModel folderTarget = new FileModel(result.getFolderId(), "", true); - AppControllerExplorer.getEventBus().fireEvent(new RefreshFolderEvent(folderTarget, false, false, true)); + AppControllerExplorer.getEventBus().fireEvent(new RefreshFolderEvent(folderTarget, false, false, false)); } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 0a00774..f587d48 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -4230,13 +4230,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT GCubeUser user = PortalContext.getConfiguration().getCurrentUser(this.getThreadLocalRequest()); String wsScope = PortalContext.getConfiguration().getCurrentScope(this.getThreadLocalRequest()); String wsUserToken = PortalContext.getConfiguration().getCurrentUserToken(wsScope, user.getUsername()); - String targetScopeUserToken = PortalContext.getConfiguration().getCurrentUserToken(vreTargetScope, user.getUsername()); - - if (isTestMode()){ - targetScopeUserToken = "89257623-0570-4fbe-a15b-458bb84f4902-98187548"; //TOKEN NEXTNEXT by FRANCESCO - } - PublishOnThredds pub = new PublishOnThredds(wsUserToken, user.getUsername(), this.getThreadLocalRequest().getSession()); return pub.publishFolder(folderToPublishId, folderMetadataId, targetScopeUserToken, catalogueName); }catch(Exception e){ diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/publish/PublishOnThredds.java b/src/main/java/org/gcube/portlets/user/workspace/server/publish/PublishOnThredds.java index 9e8fdf3..34f43a5 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/publish/PublishOnThredds.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/publish/PublishOnThredds.java @@ -91,7 +91,7 @@ public class PublishOnThredds { try{ WsUtil.setTransferPublishingOnThredds(httpSession, tr); - System.out.println("Setting ws user token : "+wsScopeUserToken); + //System.out.println("Setting ws user token : "+wsScopeUserToken); TokenSetter.setToken(wsScopeUserToken); FolderConfiguration folderConfig=new FolderConfiguration(publishingTargetScopeUserToken,folderId,catalogueName);