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

RM-1437, added checks in open/close folder actions to ensure that the rules work correctly in unfiled

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@71003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Hibbins
2014-05-19 16:13:51 +00:00
parent 2d03b705d3
commit 1bb7f1bfa0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java
View File

@@ -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;
}

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java
View File

@@ -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