Merged BRANCHES/V2.2 to HEAD:

80299: RM-1652 (Classified Records capabilities are never used)
   80313: RM-1652 (Classified Records capabilities are never used)
   80336: RM-1636 (Disposition steps can be executed for folder with frozen record)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@80344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-08-18 16:08:56 +00:00
parent 133f4507de
commit e32569bd22
4 changed files with 65 additions and 26 deletions

View File

@@ -14,12 +14,12 @@
</bean>
<!-- Assignable Capabilities -->
<bean id="rmCreateModifyDestroyClassificationGuidesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyClassificationGuides"/>
<property name="permission" value="CreateModifyDestroyClassificationGuides"/>
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<!-- <property name="group"><ref bean="classifiedRecordsGroup"/></property> -->
<property name="index" value="10" />
<property name="private" value="true" />
</bean>
@@ -28,25 +28,25 @@
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyTimeframes" />
<property name="permission" value="CreateModifyDestroyTimeframes" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<!-- <property name="group"><ref bean="classifiedRecordsGroup"/></property> -->
<property name="index" value="20" />
<property name="private" value="true" />
</bean>
<bean id="rmMapClassificationGuideMetadataCapability"
parent="declarativeCapability">
<property name="name" value="MapClassificationGuideMetadata" />
<property name="permission" value="MapClassificationGuideMetadata" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<!-- <property name="group"><ref bean="classifiedRecordsGroup"/></property> -->
<property name="index" value="30" />
<property name="private" value="true" />
</bean>
<bean id="rmUpdateClassificationDatesCapability"
parent="declarativeCapability">
<property name="name" value="UpdateClassificationDates" />
<property name="permission" value="UpdateClassificationDates" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<!-- <property name="group"><ref bean="classifiedRecordsGroup"/></property> -->
<property name="index" value="40" />
<property name="private" value="true" />
</bean>
@@ -55,11 +55,11 @@
parent="declarativeCapability">
<property name="name" value="UpdateExemptionCategories" />
<property name="permission" value="UpdateExemptionCategories" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<!-- <property name="group"><ref bean="classifiedRecordsGroup"/></property> -->
<property name="index" value="50" />
<property name="private" value="true" />
</bean>
<bean id="rmUpgradeDowngradeAndDeclassifyRecordsCapability"
parent="declarativeCapability">
<property name="name" value="UpgradeDowngradeAndDeclassifyRecords"/>
@@ -69,7 +69,7 @@
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<!-- <property name="group"><ref bean="classifiedRecordsGroup"/></property> -->
<property name="index" value="60" />
<property name="private" value="true" />
</bean>

View File

@@ -93,6 +93,7 @@
<property name="filePlanService" ref="FilePlanService" />
<property name="recordFolderService" ref="RecordFolderService"/>
<property name="recordService" ref="RecordService"/>
<property name="freezeService" ref="FreezeService"/>
<property name="dispositionSelectionStrategy">
<ref local="org_alfresco_module_rm_dispositionSelectionStrategy" />
</property>