From 1f8f4544903488a04079f038c2acca891bf1b5ba Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 6 Mar 2014 14:31:04 +0000 Subject: [PATCH] fixed change permissions git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@92754 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/resources/Icons.java | 2 +- .../client/resources/icons/sharedFolder3.png | Bin 0 -> 884 bytes .../workspace/client/rpc/GWTWorkspaceService.java | 2 +- .../client/rpc/GWTWorkspaceServiceAsync.java | 2 +- .../client/view/tree/ContextMenuTree.java | 5 +++-- .../workspace/server/GWTWorkspaceServiceImpl.java | 13 +++++-------- .../user/workspace/server/util/WsUtil.java | 3 ++- 7 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/sharedFolder3.png 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 5d42b54..6d4075f 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 @@ -236,7 +236,7 @@ public interface Icons extends ClientBundle { @Source("icons/sharingFolder.png") ImageResource shareFolder(); - @Source("icons/sharedFolder.png") + @Source("icons/sharedFolder3.png") ImageResource sharedFolder(); @Source("icons/unSharingFolder.gif") diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/sharedFolder3.png b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/sharedFolder3.png new file mode 100644 index 0000000000000000000000000000000000000000..489eba7f8d34726e46f9a28fa0e1f0ac00f4ffb4 GIT binary patch literal 884 zcmV-)1B?8LP)0dCKn5gj;bzzJ<6HPSg!dHwTfG>Pew8h#o zR7xonYNzd;>zyf}-c07c&iT&yzH=`5aB0W5T`E*bTfiBFG7!cSgwS1T=W&iOJBa&n z5Yjz+%pK?TT{nPYscgg;-kd)eR3IM-`RhA}p#o5@jS|XhTmWg?%Gp98d>T>`Xu3?Lmd)mFLygmfxfj+M2ZcS^UrWdP*CbO(UD zp~_hkM7lqr((qvUv70Ut~lsHks1Jgy^r z?Kn1VZN$$XQ}`aQLG;}VZ0%^rbgtCR38k>i2nthKw4S`h^u;I()rolmdCG>rwCU2(71&{*KLSw3=NAl zM7?=zY&OsskjPDQND_^E>y?%nrDK)LU;6!k`5BhZ!HLAMnT9V=M1zsR zgqgz7cn-gp{wh0L##LinXEbqT2nOV+LJ5Qlv=*vxDR2XkUnzUaBl&iwb>LZJ`| zR0rtTSQ^RXFIFg6nh=87woR>~Rj=N_qM4o+lv1;;tu69LfB^uTh(PWk48h6(0000< KMNUMnLSTZZC85&* literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java index 6fef555..ea387be 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java @@ -204,7 +204,7 @@ public interface GWTWorkspaceService extends RemoteService{ String getMyLogin(); - void setACLForVRE(String folderId, String aclType) throws Exception; + void updateACLForVREbyGroupIds(String folderId, String aclType) throws Exception; /** * @param folderId diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java index 1558a23..c709c32 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java @@ -182,7 +182,7 @@ public interface GWTWorkspaceServiceAsync { void getMyLogin(AsyncCallback callback); - void setACLForVRE(String folderId, String aclType, + void updateACLForVREbyGroupIds(String folderId, String aclType, AsyncCallback callback); void getUserACLForFolderId(String folderId, diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java index 45418a1..21b7fc9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java @@ -716,8 +716,9 @@ public class ContextMenuTree { contextMenu.getItemByItemId(WorkspaceOperation.SHARE.getId()).setVisible(false); //SHARE contextMenu.getItemByItemId(WorkspaceOperation.INSERT_SHARED_FOLDER.getId()).setVisible(false); //insert shared folder contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(false); //UNSHARE - contextMenu.getItemByItemId(WorkspaceOperation.RENAME.getId()).setVisible(false); //UNSHARE - contextMenu.getItemByItemId(WorkspaceOperation.REMOVE.getId()).setVisible(false); //UNSHARE + contextMenu.getItemByItemId(WorkspaceOperation.RENAME.getId()).setVisible(false); //RENAME + contextMenu.getItemByItemId(WorkspaceOperation.REMOVE.getId()).setVisible(false); //REMOVE + contextMenu.getItemByItemId(WorkspaceOperation.REFRESH_FOLDER.getId()).setVisible(true); //REFRESH_FOLDER return; } 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 aece6b3..91f790f 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 @@ -2654,16 +2654,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT * @throws Exception */ @Override - public void setACLForVRE(String folderId, String aclType) throws Exception{ + public void updateACLForVREbyGroupIds(String folderId, String aclType) throws Exception{ try { if(folderId == null) throw new Exception("Folder id is null"); - List listLogins = new ArrayList(); - listLogins.add(getMyLogin()); - - workspaceLogger.trace("Setting ACL for VRE FOLDER id: "+folderId); + workspaceLogger.trace("Updating ACL to VRE FOLDER id: "+folderId); workspaceLogger.trace("ACL type is: "+aclType); Workspace workspace = getWorkspace(); @@ -2671,14 +2668,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT if(wsItem.isShared() && (wsItem.getType().equals(WorkspaceItemType.SHARED_FOLDER))){ WorkspaceSharedFolder ite = (WorkspaceSharedFolder) workspace.getItemByPath(wsItem.getPath()); - ite.setACL(listLogins, ACLType.valueOf(aclType)); + ite.setACL(ite.getGroupIds(), ACLType.valueOf(aclType)); }else throw new Exception("Source item is not shared or shared folder"); - workspaceLogger.trace("Setting ACL completed, retuning"); + workspaceLogger.trace("Updating ACL completed, retuning"); } catch (Exception e) { workspaceLogger.error("Error in set ACLs", e); - String error = ConstantsExplorer.SERVER_ERROR +" setting permissions. "+e.getMessage(); + String error = ConstantsExplorer.SERVER_ERROR +" updating permissions. "+e.getMessage(); throw new Exception(error); } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java index 65d26f9..3e96dfd 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java @@ -84,6 +84,7 @@ public class WsUtil { //UNCOMMENT THIS IN DEVELOP ENVIROMENT // user = "francesco.mangiacrapa"; +// user = "valentina.marioli"; logger.warn("WORKSPACE PORTLET STARTING IN TEST MODE - NO USER FOUND - PORTLETS STARTING WITH FOLLOWING SETTINGS:"); logger.warn("session id: "+sessionID); @@ -111,7 +112,7 @@ public class WsUtil { withoutPortal = true; //COMMENT THIS IN PRODUCTION ENVIROMENT -// }else if(user.compareToIgnoreCase("francesco.mangiacrapa")==0){ +// }else if(user.compareToIgnoreCase("valentina.marioli")==0){ // // withoutPortal = true; //// END UNCOMMENT