From b69c5763d19d08ec2f96380456970fb45410f4cd Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 5 Mar 2015 14:32:15 +0000 Subject: [PATCH] Ready for integration testing with JoinVRE git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/join-vre@113463 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/joinvre/server/JoinServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java b/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java index e4ba632..a3d42be 100644 --- a/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java @@ -27,6 +27,10 @@ import com.liferay.portal.kernel.servlet.ImageServletTokenUtil; import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.model.Group; import com.liferay.portal.model.Organization; +import com.liferay.portal.model.User; +import com.liferay.portal.security.permission.PermissionChecker; +import com.liferay.portal.security.permission.PermissionCheckerFactoryUtil; +import com.liferay.portal.security.permission.PermissionThreadLocal; import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.theme.ThemeDisplay; @@ -125,8 +129,6 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService private static final String REQUEST_BASED_GROUP = "Requestbasedgroup"; public boolean requireAccessGrant(Organization organization) throws PortalException, SystemException { - return true; - /* try { long companyId = OrganizationsUtil.getCompany().getCompanyId(); _log.trace("Setting Thread Permission"); @@ -136,16 +138,15 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService _log.trace("Setting Permission ok!"); if (organization.getExpandoBridge().getAttribute(REQUEST_BASED_GROUP) == null || organization.getExpandoBridge().getAttribute(REQUEST_BASED_GROUP).equals("")) { - _log.trace("Attribute {} not initialized. In this case by default Access Grant is permitted", REQUEST_BASED_GROUP); + _log.trace(String.format("Attribute %s not initialized. In this case by default Access Grant is permitted", REQUEST_BASED_GROUP)); return true; } else { String attributeValue = (String) organization.getExpandoBridge().getAttribute(REQUEST_BASED_GROUP); return (attributeValue.compareTo("true") == 0); } } catch (Exception e) { - return true; + return false; } - */ } public ArrayList getPortalOrganizationMappedToVRE() throws SystemException, PortalException {