gCubeSystem
/
workspace-tree-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Francesco Mangiacrapa 2017-03-03 11:58:04 +00:00
parent b0ad8edeef
commit bb155afc8d
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
View File

@ -2132,7 +2132,8 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
} }
if(result.getValidLogins().size()==0){ 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(); info.show();
return; return;
} }

22
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
View File

@ -2870,21 +2870,24 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
AclTypeComparator comparator = new AclTypeComparator(); AclTypeComparator comparator = new AclTypeComparator();
//TO COMPLETE REPORT
List<String> validLogins = new ArrayList<String>(listLogins);
List<String> errors = new ArrayList<String>(); List<String> errors = new ArrayList<String>();
//TO REMOVE ADMINS //TO REMOVE ADMINS
List<String> admins = mapACL.get(ACLType.ADMINISTRATOR); List<String> admins = mapACL.get(ACLType.ADMINISTRATOR);
for (String admin : admins) { for (String admin : admins) {
listLogins.remove(admin); boolean removed = listLogins.remove(admin);
workspaceLogger.info("Reject username: "+admin +" as "+ACLType.ADMINISTRATOR); 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<String> validLogins = new ArrayList<String>(listLogins);
ReportAssignmentACL reportValidation = new ReportAssignmentACL(); ReportAssignmentACL reportValidation = new ReportAssignmentACL();
workspaceLogger.debug("\nChecking listLogins: "+listLogins);
for (String username : listLogins) { for (String username : listLogins) {
workspaceLogger.trace("\nChecking username: "+username); workspaceLogger.trace("\nChecking username: "+username);
for (ACLType aclHL : mapACL.keySet()) { 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) { for (String username : validLogins) {
workspaceLogger.trace("Set ACL: "+settingACL+ " to "+username); workspaceLogger.info("Set ACL: "+settingACL+ " to "+username);
} }
/*
System.out.println("\n"); System.out.println("\n");
for (String error : errors) { for (String error : errors) {
workspaceLogger.trace(error); workspaceLogger.trace(error);