inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-410: Reviewed action is available for the record after transfer

Browse Source 
* 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:
Roy Wetherall
2012-07-05 05:02:34 +00:00
parent 71e32be34a
commit 1092aee669
5 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/build.gradle
View File

@@ -50,10 +50,12 @@ test {
include '**/JSONConversionComponentTest.class'
include '**/RecordsManagementServiceImplTest.class'
include '**/CustomEMailMappingServiceServiceImplTest.class'
include '**/DispositionServiceImplTest.class'
include '**/RecordsManagementActionServiceImplTest.class'
include '**/RecordsManagementAdminServiceImplTest.class'
include '**/RecordsManagementSearchServiceImplTest.class'
testLogging.showStandardStreams = true

14
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
View File

@@ -103,6 +103,13 @@
<property name="dispositionAction" value="accession"/>
</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"
parent="capabilityCondition.base"
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.IsTransferAccessionCapabilityCondition">
@@ -120,5 +127,12 @@
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.HasDispositionDateCapabilityCondition">
<property name="dispositionService" ref="DispositionService"/>
</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>

50
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
View File

@@ -105,7 +105,8 @@
<map>
<entry key="capabilityCondition.filling" value="true"/>
<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>
</property>
</bean>
@@ -173,5 +174,52 @@
</map>
</property>
</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>

3
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
View File

@@ -128,7 +128,8 @@
<property name="conditions">
<map>
<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.destroyed" value="false"/>
<entry key="capabilityCondition.vitalRecordOrFolder" value="true"/>

4
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
View File

@@ -362,7 +362,7 @@
<value>RECORD</value>
</set>
</property>
<property name="capability" value ="ApproveRecordsScheduledForCutoff"/>
<property name="capability" value ="CutOff"/>
</bean>
<bean id="jsonConversionComponent.destroyAction"
@@ -412,7 +412,7 @@
<value>RECORD</value>
</set>
</property>
<property name="capability" value ="ApproveRecordsScheduledForCutoff"/>
<property name="capability" value ="UndoCutOff"/>
</bean>
<bean id="jsonConversionComponent.editDispositionAsOfDateAction"