Merged V2.2 to V2.3:

99471: RM-2058: RM Manager can't access Users and Groups (after upgarde)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@99472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java

@@ -35,7 +35,7 @@ public class RMv22CapabilityPatch extends CapabilityPatch
      */
     protected void applyCapabilityPatch(NodeRef filePlan) 
     {
-        // add new capability
+        // add new capbilities
         addCapability(filePlan,
                       "FileDestructionReport",
                       FilePlanRoleService.ROLE_ADMIN,
@@ -52,5 +52,11 @@ public class RMv22CapabilityPatch extends CapabilityPatch
                       "RemoveFromHold",
                       FilePlanRoleService.ROLE_ADMIN,
                       FilePlanRoleService.ROLE_RECORDS_MANAGER);
+        
+        // @see https://issues.alfresco.com/jira/browse/RM-2058
+        addCapability(filePlan, 
+        		      "ManageAccessControls", 
+        		      FilePlanRoleService.ROLE_SECURITY_OFFICER,
+                      FilePlanRoleService.ROLE_RECORDS_MANAGER);        
     }
 }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22HoldCapabilityPatch.java

@@ -23,7 +23,7 @@ import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
- * RM v2.2 patch to add new hold releated capabilities.
+ * RM v2.2 patch to update capabilities.
  *
  * @author Roy Wetherall
  * @since 2.2