From bb155afc8d17e1ddc5dcbf12776b7477b44174a6 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 3 Mar 2017 11:58:04 +0000 Subject: [PATCH] updated labels git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@144602 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/AppControllerExplorer.java | 3 ++- .../server/GWTWorkspaceServiceImpl.java | 22 +++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) 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 5463c27..330fd8b 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 @@ -2132,7 +2132,8 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } if(result.getValidLogins().size()==0){ - MessageBox info = MessageBox.info("Permissions not valid to "+file.getName(), msg, null); + msg+= "Setting permission '"+multiDragContact.getSelectedAcl().getLabel() +"' is not valid for "+file.getName(); + MessageBox info = MessageBox.info("Permissions not valid for "+file.getName(), msg, null); info.show(); 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 ed6a16e..b1e1697 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 @@ -2870,21 +2870,24 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT AclTypeComparator comparator = new AclTypeComparator(); - //TO COMPLETE REPORT - List validLogins = new ArrayList(listLogins); List errors = new ArrayList(); - //TO REMOVE ADMINS List admins = mapACL.get(ACLType.ADMINISTRATOR); for (String admin : admins) { - listLogins.remove(admin); + boolean removed = listLogins.remove(admin); workspaceLogger.info("Reject username: "+admin +" as "+ACLType.ADMINISTRATOR); - errors.add("Unable to grant the privilege "+settingACL+" for "+admin+", it's lower than (parent privilege) "+ ACLType.ADMINISTRATOR); + if(removed){ + String fullname = isTestMode()?admin: UserUtil.getUserFullName(admin); + errors.add("Unable to grant the privilege "+settingACL+" for "+fullname+", he/she is an: "+ ACLType.ADMINISTRATOR); + } } - + //TO COMPLETE REPORT + List validLogins = new ArrayList(listLogins); ReportAssignmentACL reportValidation = new ReportAssignmentACL(); + workspaceLogger.debug("\nChecking listLogins: "+listLogins); + for (String username : listLogins) { workspaceLogger.trace("\nChecking username: "+username); for (ACLType aclHL : mapACL.keySet()) { @@ -2919,12 +2922,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } } } - /* - System.out.println("\n"); + + workspaceLogger.info("Valid logins: "); for (String username : validLogins) { - workspaceLogger.trace("Set ACL: "+settingACL+ " to "+username); + workspaceLogger.info("Set ACL: "+settingACL+ " to "+username); } + /* System.out.println("\n"); for (String error : errors) { workspaceLogger.trace(error);