RM: Resolve Freeze Issues

* RM-218: Frozen records can be deleted (only the valid actions show when a record is frozen)
 * RM-315: It's possible to edit metata data for frozen record (it's not and the actions no longer show)
 * RM-347: Its possible to freese undeclared record (yes it should be and the actions to support this have been enabled)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@36389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2012-05-15 08:01:05 +00:00
parent 1ebf14fd12
commit e6a9ef31e9
5 changed files with 85 additions and 48 deletions

View File

@@ -0,0 +1,49 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Public Capabilities -->
<bean id="rmExtendRetentionPeriodOrFreezeCapability"
parent="declarativeCapability">
<property name="name" value="ExtendRetentionPeriodOrFreeze"/>
<property name="permission" value="ExtendRetentionPeriodOrFreeze"/>
<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.frozen" value="false"/>
</map>
</property>
</bean>
<bean id="rmUnfreezeCapability"
parent="declarativeCapability">
<property name="name" value="Unfreeze"/>
<property name="permission" value="Unfreeze"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.frozenOrHold" value="true"/>
</map>
</property>
</bean>
<bean id="rmViewUpdateReasonsForFreezeCapability"
parent="declarativeCapability">
<property name="name" value="ViewUpdateReasonsForFreeze"/>
<property name="permission" value="ViewUpdateReasonsForFreeze"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.frozenOrHold" value="true"/>
</map>
</property>
</bean>
</beans>

View File

@@ -103,6 +103,17 @@
</list>
</property>
</bean>
<bean id="rmCopy"
parent="declarativeCapability">
<property name="name" value="Copy"/>
<property name="private" value="true"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="targetCapability" ref="rmCreate" />
</bean>
</beans>

View File

@@ -72,6 +72,18 @@
</list>
</property>
</bean>
<bean id="rmFileToRecordsCapability"
parent="declarativeCapability">
<property name="name" value="FileToRecords"/>
<property name="private" value="true" />
<property name="conditions">
<map>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="targetCapability" ref="rmFileRecordsCapability" />
</bean>
<bean id="rmDeclareRecordsCapability"
parent="declarativeCapability">
@@ -172,13 +184,14 @@
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.cutoff" value="false"/>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.closed" value="false"/>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.declared" value="true"/>
</map>
</property>
</bean>
<!-- TODO .. this is being used for the wrong thing! ... should indicate that the use can edit the non-record meta-data of a record -->
<!-- TODO .. may need some kind of 'prep' record capability you get with file? .. I think this is what this is being used for atm -->
<bean id="rmEditNonRecordMetadataCapability"
parent="declarativeCapability"
class="org.alfresco.module.org_alfresco_module_rm.capability.impl.EditCapability">
@@ -186,7 +199,8 @@
<property name="permission" value="EditNonRecordMetadata"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.fileable" value="true"/>
<entry key="capabilityCondition.fileable" value="true"/>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
</bean>

View File

@@ -266,25 +266,7 @@
parent="declarativeCapability">
<property name="name" value="ExportAudit" />
<property name="permission" value="ExportAudit" />
</bean>
<bean id="rmExtendRetentionPeriodOrFreezeCapability"
parent="declarativeCapability">
<property name="name" value="ExtendRetentionPeriodOrFreeze"/>
<property name="permission" value="ExtendRetentionPeriodOrFreeze"/>
<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.frozen" value="false"/>
</map>
</property>
</bean>
</bean>
<bean id="rmMakeOptionalPropertiesMandatoryCapability"
parent="declarativeCapability">
@@ -397,18 +379,6 @@
</property>
</bean>
<bean id="rmUnfreezeCapability"
parent="declarativeCapability">
<property name="name" value="Unfreeze"/>
<property name="permission" value="Unfreeze"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.frozenOrHold" value="true"/>
</map>
</property>
</bean>
<bean id="rmUpdateClassificationDatesCapability"
parent="declarativeCapability">
<property name="name" value="UpdateClassificationDates" />
@@ -443,22 +413,14 @@
</property>
</bean>
<bean id="rmViewUpdateReasonsForFreezeCapability"
parent="declarativeCapability">
<property name="name" value="ViewUpdateReasonsForFreeze"/>
<property name="permission" value="ViewUpdateReasonsForFreeze"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.frozenOrHold" value="true"/>
</map>
</property>
</bean>
<!-- Record Folder capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml"/>
<!-- Record capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml"/>
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml"/>
<!-- Freeze capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml"/>
<!-- Group capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml"/>

View File

@@ -227,7 +227,7 @@
<value>RECORD</value>
</set>
</property>
<!-- <property name="capability" value="Delete"/> -->
<property name="capability" value="Copy"/>
</bean>
<bean id="jsonConversionComponent.moveRecordAction"
@@ -271,6 +271,7 @@
<value>RECORD</value>
</set>
</property>
<property name="capability" value="FileToRecords" />
</bean>
<bean id="jsonConversionComponent.file"