diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java index 7629914..fde88b0 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java @@ -125,8 +125,8 @@ public class UserUtil { RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles); // if the role is member, continue - if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER)) - continue; + //if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER)) + //continue; // admin or editor case checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(), @@ -159,8 +159,8 @@ public class UserUtil { RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles); // if the role is member, continue - if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER)) - continue; + //if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER)) + //continue; checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(), correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); @@ -182,13 +182,13 @@ public class UserUtil { RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles); //if it the role is ADMIN/EDITOR we have to be sure to set it - if(correspondentRoleToCheck.equals(RolesIntoOrganization.ADMIN) || correspondentRoleToCheck.equals(RolesIntoOrganization.EDITOR)){ + //if(correspondentRoleToCheck.equals(RolesIntoOrganization.ADMIN) || correspondentRoleToCheck.equals(RolesIntoOrganization.EDITOR)){ - checkIfRoleIsSetInCkanInstance(username, groupName, currentGroupId, - correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); + checkIfRoleIsSetInCkanInstance(username, groupName, currentGroupId, + correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); - toReturn = mapRolesIntoOrganizationToCkanRole(correspondentRoleToCheck); - } + toReturn = mapRolesIntoOrganizationToCkanRole(correspondentRoleToCheck); + //} } }catch(Exception e){ logger.error("Unable to retrieve the role information for this user. Returning member role", e); @@ -224,11 +224,11 @@ public class UserUtil { // if there is an instance of ckan in this scope.. if(ckanUtils != null){ boolean res = ckanUtils.checkRole(username, gCubeGroupName, correspondentRoleToCheck); - if(res){ + if(res && !correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER)){ // get the orgs of the user and retrieve its title and name List ckanOrgs = ckanUtils.getOrganizationsByUser(username); for (CkanOrganization ckanOrganization : ckanOrgs) { - if(ckanOrganization.getName().equals(gCubeGroupName.toLowerCase())){// || ckanOrganization.getName().equals(CKanUtilsImpl.PRODUCTION_CKAN_ORGNAME_ROOT)){ + if(ckanOrganization.getName().equals(gCubeGroupName.toLowerCase())){ orgsInWhichAtLeastEditorRole.add(new OrganizationBean(ckanOrganization.getTitle(), ckanOrganization.getName())); break; }