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

Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'"

Browse Source 
This reverts commit 3550fe3a28, reversing
changes made to f87d5ca0b806ba4fc8086365ebf932c65bf350b2.
This commit is contained in:
Roxana Dina
2016-07-05 15:48:51 +03:00
parent 3550fe3a28
commit 57b5547167
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
View File

@@ -60,9 +60,9 @@
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.TransferredCapabilityCondition"> class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.TransferredCapabilityCondition">
</bean> </bean>
<bean id="capabilityCondition.movableRecordFolder" <bean id="capabilityCondition.movable"
parent="capabilityCondition.base" parent="capabilityCondition.base"
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.MovableRecordFolderCapabilityCondition"> class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.MovableCapabilityCondition">
</bean> </bean>
<bean id="capabilityCondition.destroyed" <bean id="capabilityCondition.destroyed"

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
View File

@@ -129,7 +129,7 @@
</property> </property>
<property name="conditions"> <property name="conditions">
<map> <map>
<entry key="capabilityCondition.movableRecordFolder" value="true"/> <entry key="capabilityCondition.movable" value="true"/>
</map> </map>
</property> </property>
<property name="targetCapability" ref="rmCreateRecordFolderCapability"/> <property name="targetCapability" ref="rmCreateRecordFolderCapability"/>

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableRecordFolderCapabilityCondition.java → rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableCapabilityCondition.java
View File

@@ -36,7 +36,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
* @since 2.4.1 * @since 2.4.1
* *
*/ */
public class MovableRecordFolderCapabilityCondition extends AbstractCapabilityCondition public class MovableCapabilityCondition extends AbstractCapabilityCondition
{ {
/** /**
@@ -47,6 +47,6 @@ public class MovableRecordFolderCapabilityCondition extends AbstractCapabilityCo
{ {
if (nodeService.hasAspect(nodeRef, ASPECT_GHOSTED) && dispositionService.isDisposableItemCutoff(nodeRef)) if (nodeService.hasAspect(nodeRef, ASPECT_GHOSTED) && dispositionService.isDisposableItemCutoff(nodeRef))
return true; return true;
return ! (dispositionService.isDisposableItemCutoff(nodeRef) || recordFolderService.isRecordFolderClosed(nodeRef)); return !dispositionService.isDisposableItemCutoff(nodeRef);
} }
} }