From c1d9a7a7ea3122b18bceb16fd257ad5fdbc0b585 Mon Sep 17 00:00:00 2001 From: Mark Hibbins Date: Mon, 19 May 2014 16:13:51 +0000 Subject: [PATCH] RM-1437, added checks in open/close folder actions to ensure that the rules work correctly in unfiled git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@71003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../action/impl/CloseRecordFolderAction.java | 3 ++- .../action/impl/OpenRecordFolderAction.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java index c166468e4f..a2dbece583 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java @@ -58,7 +58,8 @@ public class CloseRecordFolderAction extends RMActionExecuterAbstractBase { boolean result = false; if (nodeService.exists(actionedUponNodeRef) && - !freezeService.isFrozen(actionedUponNodeRef)) + !freezeService.isFrozen(actionedUponNodeRef) && + !TYPE_UNFILED_RECORD_FOLDER.equals(nodeService.getType(actionedUponNodeRef))) { result = true; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java index 2c1e2cb561..ac3eea6efb 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java @@ -18,6 +18,7 @@ */ package org.alfresco.module.org_alfresco_module_rm.action.impl; +import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.repository.ChildAssociationRef; @@ -50,7 +51,8 @@ public class OpenRecordFolderAction extends RMActionExecuterAbstractBase protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { if (nodeService.exists(actionedUponNodeRef) && - !freezeService.isFrozen(actionedUponNodeRef)) + !freezeService.isFrozen(actionedUponNodeRef) && + !(dictionaryService.isSubClass(nodeService.getType(actionedUponNodeRef), ContentModel.TYPE_CONTENT) && !recordService.isFiled(actionedUponNodeRef))) { // TODO move re-open logic into a service method // TODO check that the user in question has the correct permission to re-open a records folder