The list of organizations in which a sysadmin can publish has every ckan organization

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@129156 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2016-06-18 08:13:37 +00:00
parent 96147b6e65
commit 445d2d364a
1 changed files with 28 additions and 20 deletions

View File

@ -124,19 +124,27 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
/**
* Retrieve the list of organizations in which the user can publish (roles ADMIN, EDITOR)
* If he is a SYSADMIN, he can publish everywhere
* @param username
* @return the list of organizations
*/
private List<String> getUserOrganizationsList(String username) {
logger.debug("Request for user " + username + " organizations list");
List<String> orgsName = new ArrayList<String>();
if(instance.isSysAdmin(username, getUserCKanTokenFromSession())){
logger.debug("The user " + username + " is a sysadmin. He can publish everywhere");
orgsName = instance.getOrganizationsNames();
}else{
// We need to retrieve orgs in which the user has the roles ADMIN, EDITOR
List<RolesIntoOrganization> rolesToMatch = new ArrayList<RolesIntoOrganization>();
rolesToMatch.add(RolesIntoOrganization.EDITOR);
rolesToMatch.add(RolesIntoOrganization.ADMIN);
List<String> orgsName = new ArrayList<String>();
Map<String, List<RolesIntoOrganization>> orgsAndRoles = instance.getGroupsAndRolesByUser(username, rolesToMatch);
Iterator<Entry<String, List<RolesIntoOrganization>>> iterator = orgsAndRoles.entrySet().iterator();
@ -146,7 +154,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
.next();
orgsName.add(entry.getKey());
}
}
return orgsName;
}