mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
RM-914: "Retain" action is absent
* ensured scheduled job executes retain successfully * added UI action "End Retention" .. allowing user to manually end the retention when eligible git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -129,6 +129,13 @@
|
|||||||
<property name="dispositionAction" value="cutoff"/>
|
<property name="dispositionAction" value="cutoff"/>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<bean id="capabilityCondition.retentionIsScheduled"
|
||||||
|
parent="capabilityCondition.base"
|
||||||
|
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.IsScheduledCapabilityCondition">
|
||||||
|
<property name="dispositionService" ref="DispositionService"/>
|
||||||
|
<property name="dispositionAction" value="retain"/>
|
||||||
|
</bean>
|
||||||
|
|
||||||
<bean id="capabilityCondition.isTransferAccession"
|
<bean id="capabilityCondition.isTransferAccession"
|
||||||
parent="capabilityCondition.base"
|
parent="capabilityCondition.base"
|
||||||
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.IsTransferAccessionCapabilityCondition">
|
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.IsTransferAccessionCapabilityCondition">
|
||||||
|
@@ -274,4 +274,24 @@
|
|||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<!-- End Rentention -->
|
||||||
|
<bean id="rmEndRetentionCapability"
|
||||||
|
parent="declarativeCapability">
|
||||||
|
<property name="name" value="EndRetention"/>
|
||||||
|
<property name="private" value="true"/>
|
||||||
|
<property name="kinds">
|
||||||
|
<list>
|
||||||
|
<value>RECORD_FOLDER</value>
|
||||||
|
<value>RECORD</value>
|
||||||
|
</list>
|
||||||
|
</property>
|
||||||
|
<property name="conditions">
|
||||||
|
<map>
|
||||||
|
<entry key="capabilityCondition.filling" value="true"/>
|
||||||
|
<entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>
|
||||||
|
<entry key="capabilityCondition.retentionIsScheduled" value="true" />
|
||||||
|
</map>
|
||||||
|
</property>
|
||||||
|
</bean>
|
||||||
|
|
||||||
</beans>
|
</beans>
|
@@ -267,7 +267,7 @@
|
|||||||
|
|
||||||
<bean id="retain_proxy" parent="rmProxyAction" >
|
<bean id="retain_proxy" parent="rmProxyAction" >
|
||||||
<property name="target">
|
<property name="target">
|
||||||
<bean id="retain" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RetainAction" parent="rmAction" depends-on="rmFileRecordsCapability"/>
|
<ref bean="retain"/>
|
||||||
</property>
|
</property>
|
||||||
<property name="interceptorNames">
|
<property name="interceptorNames">
|
||||||
<list>
|
<list>
|
||||||
@@ -276,6 +276,8 @@
|
|||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<bean id="retain" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RetainAction" parent="rmAction"/>
|
||||||
|
|
||||||
<!-- open record folder -->
|
<!-- open record folder -->
|
||||||
|
|
||||||
<bean id="openRecordFolder_proxy" parent="rmProxyAction" >
|
<bean id="openRecordFolder_proxy" parent="rmProxyAction" >
|
||||||
|
@@ -759,4 +759,16 @@
|
|||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<bean id="jsonConversionComponent.endRetention"
|
||||||
|
parent="jsonConversionComponent.baseAction">
|
||||||
|
<property name="name" value="endRetention"/>
|
||||||
|
<property name="kinds">
|
||||||
|
<set>
|
||||||
|
<value>RECORD</value>
|
||||||
|
<value>RECORD_FOLDER</value>
|
||||||
|
</set>
|
||||||
|
</property>
|
||||||
|
<property name="capability" value="EndRetention" />
|
||||||
|
</bean>
|
||||||
|
|
||||||
</beans>
|
</beans>
|
||||||
|
Reference in New Issue
Block a user