mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
RM-410: Reviewed action is available for the record after transfer
* Also remove "Update Disposition Action" from transferring records * Fix up cutoff and undoCutoff actions with custom capabilities since they where appearing in a number of situations when they shouldn't * Added a couple more unit tests to the list run on the continious build git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@38789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -50,10 +50,12 @@ test {
|
|||||||
|
|
||||||
include '**/JSONConversionComponentTest.class'
|
include '**/JSONConversionComponentTest.class'
|
||||||
|
|
||||||
|
include '**/RecordsManagementServiceImplTest.class'
|
||||||
include '**/CustomEMailMappingServiceServiceImplTest.class'
|
include '**/CustomEMailMappingServiceServiceImplTest.class'
|
||||||
include '**/DispositionServiceImplTest.class'
|
include '**/DispositionServiceImplTest.class'
|
||||||
include '**/RecordsManagementActionServiceImplTest.class'
|
include '**/RecordsManagementActionServiceImplTest.class'
|
||||||
include '**/RecordsManagementAdminServiceImplTest.class'
|
include '**/RecordsManagementAdminServiceImplTest.class'
|
||||||
|
include '**/RecordsManagementSearchServiceImplTest.class'
|
||||||
|
|
||||||
testLogging.showStandardStreams = true
|
testLogging.showStandardStreams = true
|
||||||
|
|
||||||
|
@@ -103,6 +103,13 @@
|
|||||||
<property name="dispositionAction" value="accession"/>
|
<property name="dispositionAction" value="accession"/>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<bean id="capabilityCondition.cutoffIsScheduled"
|
||||||
|
parent="capabilityCondition.base"
|
||||||
|
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.IsScheduledCapabilityCondition">
|
||||||
|
<property name="dispositionService" ref="DispositionService"/>
|
||||||
|
<property name="dispositionAction" value="cutoff"/>
|
||||||
|
</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">
|
||||||
@@ -121,4 +128,11 @@
|
|||||||
<property name="dispositionService" ref="DispositionService"/>
|
<property name="dispositionService" ref="DispositionService"/>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<bean id="capabilityCondition.lastDispositionActionCutoff"
|
||||||
|
parent="capabilityCondition.base"
|
||||||
|
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.LastDispositionActionCondition">
|
||||||
|
<property name="dispositionService" ref="DispositionService"/>
|
||||||
|
<property name="dispositionActionName" value="cutoff"/>
|
||||||
|
</bean>
|
||||||
|
|
||||||
</beans>
|
</beans>
|
@@ -106,6 +106,7 @@
|
|||||||
<entry key="capabilityCondition.filling" value="true"/>
|
<entry key="capabilityCondition.filling" value="true"/>
|
||||||
<entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>
|
<entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>
|
||||||
<entry key="capabilityCondition.hasDispositionAsOfDate" value="true"/>
|
<entry key="capabilityCondition.hasDispositionAsOfDate" value="true"/>
|
||||||
|
<entry key="capabilityCondition.isTransferring" value="false" />
|
||||||
</map>
|
</map>
|
||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
@@ -174,4 +175,51 @@
|
|||||||
</property>
|
</property>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<bean id="rmCutOffCapability"
|
||||||
|
parent="compositeCapability">
|
||||||
|
<property name="name" value="CutOff"/>
|
||||||
|
<property name="private" value="true"/>
|
||||||
|
<property name="kinds">
|
||||||
|
<list>
|
||||||
|
<value>RECORD_FOLDER</value>
|
||||||
|
<value>RECORD</value>
|
||||||
|
</list>
|
||||||
|
</property>
|
||||||
|
<property name="capabilities">
|
||||||
|
<list>
|
||||||
|
<ref bean="rmApproveRecordsScheduledForCutoffCapability"/>
|
||||||
|
</list>
|
||||||
|
</property>
|
||||||
|
<property name="conditions">
|
||||||
|
<map>
|
||||||
|
<entry key="capabilityCondition.cutoff" value="false"/>
|
||||||
|
<entry key="capabilityCondition.cutoffIsScheduled" value="true" />
|
||||||
|
</map>
|
||||||
|
</property>
|
||||||
|
</bean>
|
||||||
|
|
||||||
|
<bean id="rmUndoCutOffCapability"
|
||||||
|
parent="compositeCapability">
|
||||||
|
<property name="name" value="UndoCutOff"/>
|
||||||
|
<property name="private" value="true"/>
|
||||||
|
<property name="kinds">
|
||||||
|
<list>
|
||||||
|
<value>RECORD_FOLDER</value>
|
||||||
|
<value>RECORD</value>
|
||||||
|
</list>
|
||||||
|
</property>
|
||||||
|
<property name="capabilities">
|
||||||
|
<list>
|
||||||
|
<ref bean="rmApproveRecordsScheduledForCutoffCapability"/>
|
||||||
|
</list>
|
||||||
|
</property>
|
||||||
|
<property name="conditions">
|
||||||
|
<map>
|
||||||
|
<entry key="capabilityCondition.cutoff" value="true"/>
|
||||||
|
<entry key="capabilityCondition.isTransferring" value="false" />
|
||||||
|
<entry key="capabilityCondition.lastDispositionActionCutoff" value="true"/>
|
||||||
|
</map>
|
||||||
|
</property>
|
||||||
|
</bean>
|
||||||
|
|
||||||
</beans>
|
</beans>
|
@@ -129,6 +129,7 @@
|
|||||||
<map>
|
<map>
|
||||||
<entry key="capabilityCondition.filling" value="true"/>
|
<entry key="capabilityCondition.filling" value="true"/>
|
||||||
<entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>
|
<entry key="capabilityCondition.frozenOrFrozenChildren" value="false"/>
|
||||||
|
<entry key="capabilityCondition.isTransferring" value="false" />
|
||||||
<entry key="capabilityCondition.transferred" value="false"/>
|
<entry key="capabilityCondition.transferred" value="false"/>
|
||||||
<entry key="capabilityCondition.destroyed" value="false"/>
|
<entry key="capabilityCondition.destroyed" value="false"/>
|
||||||
<entry key="capabilityCondition.vitalRecordOrFolder" value="true"/>
|
<entry key="capabilityCondition.vitalRecordOrFolder" value="true"/>
|
||||||
|
@@ -362,7 +362,7 @@
|
|||||||
<value>RECORD</value>
|
<value>RECORD</value>
|
||||||
</set>
|
</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="capability" value ="ApproveRecordsScheduledForCutoff"/>
|
<property name="capability" value ="CutOff"/>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<bean id="jsonConversionComponent.destroyAction"
|
<bean id="jsonConversionComponent.destroyAction"
|
||||||
@@ -412,7 +412,7 @@
|
|||||||
<value>RECORD</value>
|
<value>RECORD</value>
|
||||||
</set>
|
</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="capability" value ="ApproveRecordsScheduledForCutoff"/>
|
<property name="capability" value ="UndoCutOff"/>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<bean id="jsonConversionComponent.editDispositionAsOfDateAction"
|
<bean id="jsonConversionComponent.editDispositionAsOfDateAction"
|
||||||
|
Reference in New Issue
Block a user