inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/merge_from_v2.2.0.1

Browse Source
This commit is contained in:
David Webster
2016-09-30 16:33:49 +01:00
parent 5f40921c12 ecbf4d1edc
commit 028e3d47e3
28 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
View File

@@ -124,8 +124,9 @@ public class RMPermissionServiceImpl extends PermissionServiceImpl
{ {
return super.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS); return super.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS);
} }
// Added ADD_CHILDREN check in for MNT-16852.
else if (AccessStatus.DENIED.equals(acs) && else if (AccessStatus.DENIED.equals(acs) &&
PermissionService.WRITE.equals(perm) && (PermissionService.WRITE.equals(perm) || PermissionService.ADD_CHILDREN.equals(perm)) &&
nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT)) nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
{ {
return super.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS); return super.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS);