diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml index f5c6002019..9429d9194a 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml @@ -71,4 +71,42 @@ + + + + + + RECORD_FOLDER + RECORD + + + + + + + + + + + + + + + + + RECORD_FOLDER + RECORD + + + + + + + + + + + \ No newline at end of file diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties index e56b72bcee..eba6e0782f 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties @@ -63,6 +63,8 @@ capability.ExtendRetentionPeriodOrFreeze.title=Extend Retention Period or Freeze capability.Unfreeze.title=Unfreeze capability.ViewUpdateReasonsForFreeze.title=View Update Reasons for Freeze capability.CreateHold.title=Create Hold +capability.AddToHold.title=Add to Hold +capability.RemoveFromHold.title=Remove from Hold # Audit capability.group.audit.title=Audit diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml index 92345a652e..b31734f6f7 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsPermissionModel.xml @@ -90,6 +90,8 @@ + + @@ -173,6 +175,8 @@ + + @@ -456,6 +460,13 @@ + + + + + + + \ No newline at end of file diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml index b3eb5bff5c..9b69a18b38 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml @@ -843,4 +843,28 @@ + + + + + + RECORD + RECORD_FOLDER + + + + + + + + + + RECORD + RECORD_FOLDER + + + + diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json index 276df24eec..10a0fe56c3 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json @@ -139,7 +139,9 @@ "RejectRecords", "LinkToRecords", "FileTransferReport", - "CreateHold" + "CreateHold", + "AddToHold", + "RemoveFromHold" ] }, { @@ -207,7 +209,9 @@ "RejectRecords", "LinkToRecords", "FileTransferReport", - "CreateHold" + "CreateHold", + "AddToHold", + "RemoveFromHold" ] } ] \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java index 9e093924be..33bb7340ef 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java @@ -149,6 +149,14 @@ public class RMv22CapabilityPatch extends AbstractModulePatch "CreateHold", FilePlanRoleService.ROLE_ADMIN, FilePlanRoleService.ROLE_RECORDS_MANAGER); + addCapability(filePlan, + "AddToHold", + FilePlanRoleService.ROLE_ADMIN, + FilePlanRoleService.ROLE_RECORDS_MANAGER); + addCapability(filePlan, + "RemoveFromHold", + FilePlanRoleService.ROLE_ADMIN, + FilePlanRoleService.ROLE_RECORDS_MANAGER); } } }