From 4c1734bd501c64fb9a89577593a33fcb5d9b9a91 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Mon, 4 Jul 2016 12:11:43 +0000 Subject: [PATCH] minor fix git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@129847 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/GcubeCkanDataCatalogServiceImpl.java | 2 +- .../gcubeckan/gcubeckandatacatalog/server/UserUtil.java | 4 ++-- 2 files 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 507142b..cc340d8 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 @@ -311,7 +311,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem // In this way the publish widget can simply retrieve those information from the ASL session if(!toReturn.equals(CkanRole.MEMBER)){ UserUtil.getLicenses(httpSession, username, concatenateSessionKeyScope(CKAN_LICENSES_KEY, currentScope), ckanUtils); - UserUtil.getUserOrganizationsList(httpSession, username, concatenateSessionKeyScope(CKAN_ORGANIZATIONS_PUBLISH_KEY, currentScope), ckanUtils, getUserCKanTokenFromSession()); + UserUtil.getUserOrganizationsList(httpSession, username, isSysAdmin, concatenateSessionKeyScope(CKAN_ORGANIZATIONS_PUBLISH_KEY, currentScope), ckanUtils, getUserCKanTokenFromSession()); UserUtil.getMetadataProfilesList(httpSession, username, concatenateSessionKeyScope(CKAN_PROFILES_KEY, currentScope), ckanUtils); } } 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 a68e658..6eaf5c4 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 @@ -309,14 +309,14 @@ public class UserUtil { * @param ckanOrganizationsPublishKey * @param ckanUtils */ - public static void getUserOrganizationsList(HttpSession session, String username, + public static void getUserOrganizationsList(HttpSession session, String username, boolean isSysAdmin, String ckanOrganizationsPublishKey, CKanUtils ckanUtils, String token) { try{ logger.debug("Request for user " + username + " organizations list"); List orgsName = new ArrayList(); - if(ckanUtils.isSysAdmin(username, token)){ + if(isSysAdmin){ logger.info("The user " + username + " is a sysadmin. He can publish everywhere"); orgsName = ckanUtils.getOrganizationsNames(); // get all organizations' names