Skip to content

Commit

Permalink
Revert "LPS-44724 Complete rollback because it breaks DLFileEntryPerm…
Browse files Browse the repository at this point in the history
…issionTest"

This reverts commit b377186.
  • Loading branch information
robertoDiaz authored and brianchandotcom committed Apr 16, 2014
1 parent 2c5e00c commit 13a9d1a
Showing 1 changed file with 26 additions and 0 deletions.
Expand Up @@ -15,9 +15,14 @@
package com.liferay.portlet.documentlibrary.service.permission;

import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.staging.permission.StagingPermissionUtil;
import com.liferay.portal.model.ResourceConstants;
import com.liferay.portal.security.auth.PrincipalException;
import com.liferay.portal.security.permission.PermissionChecker;
import com.liferay.portal.service.ResourceLocalServiceUtil;
import com.liferay.portal.service.ResourcePermissionLocalServiceUtil;
import com.liferay.portal.util.PortletKeys;

/**
Expand Down Expand Up @@ -48,8 +53,29 @@ public static boolean contains(
return hasPermission.booleanValue();
}

try {
int count =
ResourcePermissionLocalServiceUtil.getResourcePermissionsCount(
permissionChecker.getCompanyId(), RESOURCE_NAME,
ResourceConstants.SCOPE_INDIVIDUAL,
String.valueOf(groupId));

if (count == 0) {
ResourceLocalServiceUtil.addResources(
permissionChecker.getCompanyId(), groupId, 0, RESOURCE_NAME,
groupId, false, true, true);
}
}
catch (Exception e) {
if (_log.isWarnEnabled()) {
_log.warn(e, e);
}
}

return permissionChecker.hasPermission(
groupId, RESOURCE_NAME, groupId, actionId);
}

private static Log _log = LogFactoryUtil.getLog(DLPermission.class);

}

0 comments on commit 13a9d1a

Please sign in to comment.