From 96dab149834f6346f80b944971a16b080b1ac705 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 29 Sep 2020 09:43:52 +0200 Subject: [PATCH] Bug fixes https://support.d4science.org/issues/19759#note-12 --- pom.xml | 2 +- .../client/view/windows/DialogGetInfoBootstrap.java | 12 +++--------- .../workspace/server/GWTWorkspaceServiceImpl.java | 6 ++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 8f7e7b5..0ae4224 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.portlets.user workspace-tree-widget - 6.31.0 + 6.31.0-SNAPSHOT gCube Workspace Tree Widget gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfoBootstrap.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfoBootstrap.java index 6d7d768..09c895b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfoBootstrap.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfoBootstrap.java @@ -307,13 +307,8 @@ public class DialogGetInfoBootstrap extends Composite { htmlSetValue(txtMimeType, fileModel.getType()); txtAreaDescription.setResize(ResizeType.VERTICAL); - - if (fileModel.isDirectory()) { - txtAreaDescription.setValue(fileModel.getDescription()); - // add(txtAreaDescription); - } else - loadDescription(fileModel.getIdentifier()); - + //load description + loadDescription(fileModel.getIdentifier()); //owner htmlSetValue(txtOwner, fileModel.getOwnerFullName()); //creation date @@ -329,14 +324,12 @@ public class DialogGetInfoBootstrap extends Composite { }else { loadLastModificationDate(fileModel.getIdentifier()); loadSize(fileModel.getIdentifier()); - } htmlSetValue(txtShared, fileModel.isShared()+""); // USERS SHARED if (fileModel.isShared()) { - cgSharedWith.setVisible(true); loadACLsDescriptionForSharedFolder(fileModel.getIdentifier()); } @@ -545,6 +538,7 @@ public class DialogGetInfoBootstrap extends Composite { @Override public void onFailure(Throwable caught) { + loadDescription(fileModel.getIdentifier()); new MessageBoxAlert("Error on updating description...", caught.getMessage(), null); } 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 d71cd0a..85d7556 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 @@ -3102,8 +3102,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } catch (Exception e) { workspaceLogger.error("Error on updating the description for item: " + itemId, e); + + if(e.getMessage().toLowerCase().contains("insufficent privileges")) { + throw new Exception("You don't have permission to update this description"); + } + String error = ConstantsExplorer.SERVER_ERROR + " updating the description for item with id: " + "" + itemId+". Error reported: "+e.getMessage(); + throw new Exception(error); }