From c6586b9a470624b27fe0f4105070d346d4e9ee94 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Wed, 22 Jun 2016 14:56:16 +0000 Subject: [PATCH] Fixed retrieve role methods git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@129305 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/GcubeCkanDataCatalogServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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;