Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

LPS-26791 Source formatting

  • Loading branch information...
commit 1a8a38d70967d5287b3c80cea6f9186ff32baa31 1 parent f99ad3b
@brianchandotcom brianchandotcom authored
View
2  portal-impl/src/com/liferay/portal/lar/PortletDataContextImpl.java
@@ -1324,7 +1324,7 @@ protected ServiceContext createServiceContext(
if (ResourceBlockLocalServiceUtil.isSupported(className)) {
return ResourceBlockPermissionLocalServiceUtil.
- getAvailableResourcePermissionActionIds(
+ getAvailableResourceBlockPermissionActionIds(
roleIds, className, primKey, actionIds);
}
else {
View
13 portal-impl/src/com/liferay/portal/service/impl/ResourceBlockPermissionLocalServiceImpl.java
@@ -71,13 +71,12 @@ public void deleteResourceBlockPermissions(long resourceBlockId)
resourceBlockId);
}
- public Map<Long, Set<String>> getAvailableResourcePermissionActionIds(
- long[] roleIds, String className, long primKey,
- List<String> actionIds)
+ public Map<Long, Set<String>> getAvailableResourceBlockPermissionActionIds(
+ long[] roleIds, String name, long primKey, List<String> actionIds)
throws PortalException, SystemException {
ResourceBlock resourceBlock =
- resourceBlockLocalService.getResourceBlock(className, primKey);
+ resourceBlockLocalService.getResourceBlock(name, primKey);
Map<Long, Set<String>> roleIdsToActionIds =
new HashMap<Long, Set<String>>();
@@ -89,10 +88,10 @@ public void deleteResourceBlockPermissions(long resourceBlockId)
continue;
}
- List<String> resourceBlockActions =
+ List<String> resourceBlockActionIds =
resourceBlockLocalService.getPermissions(resourceBlock, roleId);
- if (resourceBlockActions.isEmpty()) {
+ if (resourceBlockActionIds.isEmpty()) {
continue;
}
@@ -101,7 +100,7 @@ public void deleteResourceBlockPermissions(long resourceBlockId)
roleIdsToActionIds.put(roleId, availableActionIds);
for (String actionId : actionIds) {
- if (resourceBlockActions.contains(actionId)) {
+ if (resourceBlockActionIds.contains(actionId)) {
availableActionIds.add(actionId);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.