From 9ee1f9c38a977523568cfcd73a9a2ae6775243f9 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Wed, 1 Feb 2017 17:11:48 +0000 Subject: [PATCH] minor fix on role retrieval git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@142014 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/utils/Utils.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java index 9b657a6..b4516af 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java @@ -156,12 +156,7 @@ public class Utils { checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(), correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); - if(toReturn.equals(RolesCkanGroupOrOrg.ADMIN)) - continue; - else if(toReturn.equals(RolesCkanGroupOrOrg.EDITOR) && correspondentRoleToCheck.equals(RolesCkanGroupOrOrg.ADMIN)) - toReturn = RolesCkanGroupOrOrg.ADMIN; - else // it was MEMBER - toReturn = correspondentRoleToCheck; + toReturn = RolesCkanGroupOrOrg.getHigher(toReturn, correspondentRoleToCheck); } @@ -186,12 +181,7 @@ public class Utils { checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, gCubeGroup.getGroupId(), correspondentRoleToCheck, groupManager, gcubeCkanDataCatalogServiceImpl, orgsInWhichAtLeastEditorRole); - if(toReturn.equals(RolesCkanGroupOrOrg.ADMIN)) - continue; - else if(toReturn.equals(RolesCkanGroupOrOrg.EDITOR) && correspondentRoleToCheck.equals(RolesCkanGroupOrOrg.ADMIN)) - toReturn = RolesCkanGroupOrOrg.ADMIN; - else - toReturn = correspondentRoleToCheck; + toReturn = RolesCkanGroupOrOrg.getHigher(toReturn, correspondentRoleToCheck); } }else if(groupManager.isVRE(currentGroupId)){