From fbeb6a3f9371ce2ca5b2b693812e77c9d68eb06d Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 3 Dec 2018 10:05:02 +0000 Subject: [PATCH] fixing the method getAdministrators git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@174502 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/GWTWorkspaceServiceImpl.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 d5bd1cc..6be71d5 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 @@ -2500,16 +2500,21 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT */ @Override public List getAdministratorsByFolderId(String folderId) throws Exception { - List admins = new ArrayList(); if(folderId==null) - return admins; + return new ArrayList(); try { - workspaceLogger.info("Getting administator/s to folder: "+folderId); + workspaceLogger.info("Getting administator/s for the folder: "+folderId); WorkspaceFolder wsFolder = getSharedWorkspaceFolderForId(folderId); - GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); - WorkspaceSharedFolder wsSharedFolder = (WorkspaceSharedFolder) wsFolder; - return builder.buildGxtInfoContactsFromPortalLogins(wsSharedFolder.getAdministrators()); + + //Reading the base Shared Folder + Workspace workspace = getWorkspace(); + WorkspaceSharedFolder wsBaseSharedFolder = (WorkspaceSharedFolder) workspace.getItem(wsFolder.getIdSharedFolder()); + //Reading ADMINS from Root Shared Folder + List admins = wsBaseSharedFolder.getAdministrators(); + + workspaceLogger.info("Returning admin/s from HL: "+admins.toString()); + return GWTWorkspaceBuilder.buildGxtInfoContactsFromPortalLogins(admins); } catch (WorkspaceHandledException e){ workspaceLogger.error("Error in server getAdministratorsByFolderId: "+e.getMessage()); @@ -2569,6 +2574,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT */ @Override public WorkspaceACL getACLBySharedFolderId(String identifier) throws Exception { + //THESE ARE WRITE_OWN, WRITE_ALL, READ_ONLY workspaceLogger.info("Getting ACLBySharedFolderId: "+identifier); if(identifier==null || identifier.isEmpty()){ workspaceLogger.warn("Getting ACLBySharedFolderId identifier is null or empty, returning null");