inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-731: Impossible to add 'read and file' permissions for default categories

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@55510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-19 01:30:25 +00:00
parent b0a375221b
commit 91c2a02b7c
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java
View File

@@ -868,10 +868,13 @@ public class RecordsManagementSecurityServiceImpl implements RecordsManagementSe
{ {
NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef(); NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef();
if (parent != null && if (parent != null &&
recordsManagementService.isFilePlan(parent) == false) recordsManagementService.isFilePlanComponent(nodeRef) == true)
{ {
setPermissionImpl(parent, authority, RMPermissionModel.READ_RECORDS); setPermissionImpl(parent, authority, RMPermissionModel.READ_RECORDS);
setReadPermissionUp(parent, authority); if (recordsManagementService.isFilePlan(parent) == false)
{
setReadPermissionUp(parent, authority);
}
} }
} }
@@ -910,7 +913,8 @@ public class RecordsManagementSecurityServiceImpl implements RecordsManagementSe
*/ */
private void setPermissionImpl(NodeRef nodeRef, String authority, String permission) private void setPermissionImpl(NodeRef nodeRef, String authority, String permission)
{ {
if (RMPermissionModel.FILING.equals(permission) == true) if (RMPermissionModel.FILING.equals(permission) == true &&
permissionService.getInheritParentPermissions(nodeRef) == false)
{ {
// Remove record read permission before adding filing permission // Remove record read permission before adding filing permission
permissionService.deletePermission(nodeRef, authority, RMPermissionModel.READ_RECORDS); permissionService.deletePermission(nodeRef, authority, RMPermissionModel.READ_RECORDS);
@@ -928,21 +932,25 @@ public class RecordsManagementSecurityServiceImpl implements RecordsManagementSe
{ {
public Boolean doWork() throws Exception public Boolean doWork() throws Exception
{ {
// Delete permission on this node // can't delete permissions if inherited (eg hold and transfer containers)
permissionService.deletePermission(nodeRef, authority, permission); if (permissionService.getInheritParentPermissions(nodeRef) == false)
if (recordsManagementService.isRecordCategory(nodeRef) == true)
{ {
List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); // Delete permission on this node
for (ChildAssociationRef assoc : assocs) permissionService.deletePermission(nodeRef, authority, permission);
{
NodeRef child = assoc.getChildRef(); if (recordsManagementService.isRecordCategory(nodeRef) == true)
if (recordsManagementService.isRecordCategory(child) == true || {
recordsManagementService.isRecordFolder(child) == true) List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
{ for (ChildAssociationRef assoc : assocs)
deletePermission(child, authority, permission); {
} NodeRef child = assoc.getChildRef();
} if (recordsManagementService.isRecordCategory(child) == true ||
recordsManagementService.isRecordFolder(child) == true)
{
deletePermission(child, authority, permission);
}
}
}
} }
return null; return null;