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

RM-1746 (Moved record/category always have the inheritance on)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1.0.x@88959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-10-22 19:06:49 +00:00
parent b4aefce9df
commit f8d808070f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java
View File

@@ -331,10 +331,6 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl
{ {
NodeRef sourceCategory = oldChildAssocRef.getChildRef(); NodeRef sourceCategory = oldChildAssocRef.getChildRef();
boolean inheritParentPermissions = permissionService.getInheritParentPermissions(sourceCategory); boolean inheritParentPermissions = permissionService.getInheritParentPermissions(sourceCategory);
if (!inheritParentPermissions)
{
permissionService.setInheritParentPermissions(sourceCategory, true);
}
Set<AccessPermission> keepPerms = new HashSet<AccessPermission>(5); Set<AccessPermission> keepPerms = new HashSet<AccessPermission>(5);
Set<AccessPermission> origionalCategoryPerms= permissionService.getAllSetPermissions(sourceCategory); Set<AccessPermission> origionalCategoryPerms= permissionService.getAllSetPermissions(sourceCategory);
@@ -362,6 +358,8 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl
setPermission(sourceCategory, keeper.getAuthority(), keeper.getPermission()); setPermission(sourceCategory, keeper.getAuthority(), keeper.getPermission());
} }
permissionService.setInheritParentPermissions(sourceCategory, isFilePlan(newChildAssocRef.getParentRef()) ? false : inheritParentPermissions);
return null; return null;
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());
@@ -418,6 +416,8 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl
NodeRef record = sourceAssocRef.getChildRef(); NodeRef record = sourceAssocRef.getChildRef();
if (nodeService.exists(record) && nodeService.hasAspect(record, ASPECT_RECORD)) if (nodeService.exists(record) && nodeService.hasAspect(record, ASPECT_RECORD))
{ {
boolean inheritParentPermissions = permissionService.getInheritParentPermissions(record);
Set<AccessPermission> keepPerms = new HashSet<AccessPermission>(5); Set<AccessPermission> keepPerms = new HashSet<AccessPermission>(5);
Set<AccessPermission> origionalRecordPerms= permissionService.getAllSetPermissions(record); Set<AccessPermission> origionalRecordPerms= permissionService.getAllSetPermissions(record);
@@ -446,6 +446,8 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl
{ {
setPermission(record, keeper.getAuthority(), keeper.getPermission()); setPermission(record, keeper.getAuthority(), keeper.getPermission());
} }
permissionService.setInheritParentPermissions(record, inheritParentPermissions);
} }
return null; return null;