From 1e82f26fb93a5ad8fe453c851c547b1e8be9a23d Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 10 Mar 2014 16:50:28 +0000 Subject: [PATCH] updated set ACL for VRE as users git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@92890 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/rpc/GWTWorkspaceService.java | 2 +- .../user/workspace/client/rpc/GWTWorkspaceServiceAsync.java | 2 +- .../user/workspace/server/GWTWorkspaceServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 ea387be..164af4d 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 updateACLForVREbyGroupIds(String folderId, String aclType) throws Exception; + void updateACLForVREbyUsers(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 c709c32..9c46fd4 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 updateACLForVREbyGroupIds(String folderId, String aclType, + void updateACLForVREbyUsers(String folderId, String aclType, AsyncCallback callback); void getUserACLForFolderId(String folderId, 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 fdbe76d..8669044 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 @@ -2663,7 +2663,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT * @throws Exception */ @Override - public void updateACLForVREbyGroupIds(String folderId, String aclType) throws Exception{ + public void updateACLForVREbyUsers(String folderId, String aclType) throws Exception{ try { if(folderId == null) @@ -2677,7 +2677,7 @@ 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(ite.getGroupIds(), ACLType.valueOf(aclType)); + ite.setACL(ite.getUsers(), ACLType.valueOf(aclType)); }else throw new Exception("Source item is not shared or shared folder");