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:
Roy Wetherall
2013-09-05 00:47:15 +00:00
parent 70c6e25d66
commit c68ed17d2d
4 changed files with 43 additions and 2 deletions

View File

@@ -128,6 +128,13 @@
<property name="dispositionService" ref="DispositionService"/>
<property name="dispositionAction" value="cutoff"/>
</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"
parent="capabilityCondition.base"

View File

@@ -3,7 +3,7 @@
<beans>
<!-- Assignable Capabilities -->
<!-- Cut off -->
<bean id="rmApproveRecordsScheduledForCutoffCapability"
parent="declarativeCapability">
@@ -273,5 +273,25 @@
</list>
</property>
</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>

View File

@@ -267,7 +267,7 @@
<bean id="retain_proxy" parent="rmProxyAction" >
<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 name="interceptorNames">
<list>
@@ -275,6 +275,8 @@
</list>
</property>
</bean>
<bean id="retain" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RetainAction" parent="rmAction"/>
<!-- open record folder -->

View File

@@ -758,5 +758,17 @@
</set>
</property>
</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>