diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java index 8db7418..5d9b847 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java @@ -267,7 +267,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem UserManager userManager = new LiferayUserManager(); RoleManager roleManager = new LiferayRoleManager(); GroupManager groupManager = new LiferayGroupManager(); - List roles = roleManager.listRolesByUserAndGroup(groupManager.getGroupId(groupName), userManager.getUserId(username)); + List roles = roleManager.listRolesByUserAndGroup(userManager.getUserId(username), groupManager.getGroupId(groupName)); logger.debug("The list of roles for " + username + " into " + groupName + " is " + roles); @@ -279,11 +279,11 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem for (GCubeRole role : roles) { logger.debug("User " + username + " has role " + role.getRoleName() + " in " + currentScope); - if(role.getRoleName().contains(CkanRolesIntoLiferay.CATALOG_ADMIN.toString())){ + if(role.getRoleName().equalsIgnoreCase(CkanRolesIntoLiferay.CATALOG_ADMIN.toString())){ mainRole = CkanRolesIntoLiferay.CATALOG_ADMIN; correspondentRoleToCheck = RolesIntoOrganization.ADMIN; break; - }else if(role.getRoleName().contains(CkanRolesIntoLiferay.CATALOG_EDITOR.toString())){ + }else if(role.getRoleName().equalsIgnoreCase(CkanRolesIntoLiferay.CATALOG_EDITOR.toString())){ mainRole = CkanRolesIntoLiferay.CATALOG_EDITOR; correspondentRoleToCheck = RolesIntoOrganization.EDITOR; break;