Fixed the following issues

- RM-829 (Could not cut off folder if it's contain a record)
 - RM-830 (It's impossible to undo Cut Off for folders and records)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-08-14 19:39:19 +00:00
parent 0ced9a82ba
commit d8f66a6994

View File

@@ -121,7 +121,7 @@
<property name="group"><ref bean="dispositionAndTransfersGroup"/></property> <property name="group"><ref bean="dispositionAndTransfersGroup"/></property>
<property name="index" value="60" /> <property name="index" value="60" />
</bean> </bean>
<!-- file destruction report capability --> <!-- file destruction report capability -->
<bean id="rmFileDestructionReportCapability" <bean id="rmFileDestructionReportCapability"
parent="declarativeCapability"> parent="declarativeCapability">
@@ -132,17 +132,17 @@
<value>RECORD</value> <!-- Only applies to records and record folders --> <value>RECORD</value> <!-- Only applies to records and record folders -->
<value>RECORD_FOLDER</value> <value>RECORD_FOLDER</value>
</list> </list>
</property> </property>
<property name="conditions"> <property name="conditions">
<map> <map>
<entry key="capabilityCondition.filling" value="true"/> <!-- Must have read and file permissions --> <entry key="capabilityCondition.filling" value="true"/> <!-- Must have read and file permissions -->
<entry key="capabilityCondition.frozen" value="false"/> <!-- Not for frozen records --> <entry key="capabilityCondition.frozen" value="false"/> <!-- Not for frozen records -->
<entry key="capabilityCondition.destroyed" value="true"/> <!-- Only for destroyed things --> <entry key="capabilityCondition.destroyed" value="true"/> <!-- Only for destroyed things -->
</map> </map>
</property> </property>
<property name="group"><ref bean="dispositionAndTransfersGroup"/></property> <!-- Part of the disposition group of capabilities --> <property name="group"><ref bean="dispositionAndTransfersGroup"/></property> <!-- Part of the disposition group of capabilities -->
<property name="index" value="110" /> <property name="index" value="110" />
</bean> </bean>
<!-- Non-assignable Capabilities --> <!-- Non-assignable Capabilities -->
@@ -226,7 +226,6 @@
<property name="conditions"> <property name="conditions">
<map> <map>
<entry key="capabilityCondition.cutoff" value="false"/> <entry key="capabilityCondition.cutoff" value="false"/>
<entry key="capabilityCondition.cutoffIsScheduled" value="true" />
</map> </map>
</property> </property>
</bean> </bean>
@@ -250,11 +249,10 @@
<map> <map>
<entry key="capabilityCondition.cutoff" value="true"/> <entry key="capabilityCondition.cutoff" value="true"/>
<entry key="capabilityCondition.isTransferring" value="false" /> <entry key="capabilityCondition.isTransferring" value="false" />
<entry key="capabilityCondition.lastDispositionActionCutoff" value="true"/>
</map> </map>
</property> </property>
</bean> </bean>
<bean id="rmDestroyCapability" <bean id="rmDestroyCapability"
parent="compositeCapability"> parent="compositeCapability">
<property name="name" value="Destroy"/> <property name="name" value="Destroy"/>