From dd8bdb5bc475dfd6d1709bf793d1ffc3b567f35c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 4 Jun 2013 12:38:21 +0000 Subject: [PATCH] Ticket #1822 fixed: folder description is updatable git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@76737 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/workspace/client/AppControllerExplorer.java | 4 ++++ .../user/workspace/client/view/sharing/DialogShareFolder.java | 4 ++++ .../portlets/user/workspace/server/GWTWorkspaceBuilder.java | 3 +++ .../user/workspace/server/GWTWorkspaceServiceImpl.java | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) 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 0d2e42e..300cf57 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 @@ -1096,6 +1096,10 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt if(sourceFileModel.isDirectory()){ // + + //TODO REMOVE +// System.out.println("description folder: "+dialogAddFolder.getDescription()); + rpcWorkspaceService.createFolder(dialogAddFolder.getName(), dialogAddFolder.getDescription(), sourceFileModel, new AsyncCallback(){ @Override diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java index 7595de7..933237e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java @@ -106,6 +106,10 @@ public class DialogShareFolder extends Dialog { textAreaDescription.setFieldLabel(ConstantsExplorer.DIALOG_DESCRIPTION); textAreaDescription.setHeight(heightTextArea); textAreaDescription.setWidth(380); + + //TODO REMOVE +// System.out.println("folder description: "+folder.getDescription()); + textAreaDescription.setValue(folder.getDescription()); // textAreaDescription.setReadOnly(true); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index 4af6908..40203f7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -1311,6 +1311,9 @@ public class GWTWorkspaceBuilder { FolderModel folder = new FolderModel(wsFolder.getId(),wsFolder.getName(), parent, true, wsFolder.isShared()); folder.setShareable(true); + folder.setDescription(wsFolder.getDescription()); +// folder.setOwner(wsFolder.getOwner()); + if(parent != null && parent.isShared()){ folder.setShared(true); 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 1d657fc..53b4a25 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 @@ -158,7 +158,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT gcubeScope = GCUBEScope.getScope(scopeId); } WorkspaceFolder root = workspace.getRoot(gcubeScope); -// WorkspaceFolder root = workspace.getRoot(); //TODO CHAGE METHOD +// WorkspaceFolder root = workspace.getRoot(); // WorkspaceFolder root = workspace.getRoot(scopeId);