From 2038dd40e2edbc2c6470e87867056d2759493e50 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 17 Mar 2016 17:35:50 +0000 Subject: [PATCH] updated getVirtual Groups method git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/custom-portal-handler@125693 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../impl/GCubeSiteManagerImpl.java | 29 +++---------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/gcube/portal/custom/communitymanager/impl/GCubeSiteManagerImpl.java b/src/main/java/org/gcube/portal/custom/communitymanager/impl/GCubeSiteManagerImpl.java index 1ee081e..23a49b8 100644 --- a/src/main/java/org/gcube/portal/custom/communitymanager/impl/GCubeSiteManagerImpl.java +++ b/src/main/java/org/gcube/portal/custom/communitymanager/impl/GCubeSiteManagerImpl.java @@ -8,6 +8,7 @@ import java.io.InputStream; import java.util.Arrays; import java.util.List; +import org.gcube.common.portal.CustomAttributeKeys; import org.gcube.portal.custom.communitymanager.PortletsIdManager; import org.gcube.portal.custom.communitymanager.SiteManagerUtil; import org.gcube.portal.custom.communitymanager.components.GCUBELayoutTab; @@ -56,12 +57,12 @@ public class GCubeSiteManagerImpl extends SiteManagerUtil { * FIXME public as generic resource */ public static final String SITE_DEFAULT_LOGO = "/org/gcube/portal/custom/communitymanager/resources/default_logo.png"; - private static final String CATEGORY = "Virtualgroup"; + public static List getVirtualGroups() throws PortalException, SystemException { try { - ExpandoBridge expandoBridge = ExpandoBridgeFactoryUtil.getExpandoBridge(SiteManagerUtil.getCompany().getCompanyId(), Organization.class.getName()); - String[] groups = (String[]) expandoBridge.getAttributeDefault("Virtualgroup"); + ExpandoBridge expandoBridge = ExpandoBridgeFactoryUtil.getExpandoBridge(SiteManagerUtil.getCompany().getCompanyId(), Group.class.getName()); + String[] groups = (String[]) expandoBridge.getAttributeDefault(CustomAttributeKeys.VIRTUAL_GROUP.getKeyName()); return Arrays.asList(groups); } catch (Exception e) { e.printStackTrace(); @@ -69,28 +70,6 @@ public class GCubeSiteManagerImpl extends SiteManagerUtil { } } - - public static String getVirtualGroupName(Group site){ - try { - _log.debug("Setting Thread Permission"); - long userId = LiferayUserManager.getAdmin().getUserId(); - PrincipalThreadLocal.setName(userId); - PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(UserLocalServiceUtil.getUser(userId), false); - PermissionThreadLocal.setPermissionChecker(permissionChecker); - - if (site.getExpandoBridge().getAttribute(CATEGORY) == null || site.getExpandoBridge().getAttribute(CATEGORY).equals("")) { - _log.warn(String.format("Attribute %s not initialized.", CATEGORY)); - return null; - } else { - String[] values = (String[]) site.getExpandoBridge().getAttribute(CATEGORY); - return values[0]; - } - } catch (Exception e) { - e.printStackTrace(); - return "Exception "; - } - } - /** * * @param rootVoName the voName