From 6cdf32641212da512af72c9f73a7a42d3067a7f9 Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Mon, 26 Apr 2021 14:46:46 +0300 Subject: [PATCH] MNT-22138: [AGS] Document Filed to RM File Plan under categories with cut off retention schedule no longer accessible to non admin users in collab site - Adressed review comments and fixed ui test --- .../disposition/DispositionServiceImpl.java | 3 ++- .../jscript/app/JSONConversionComponent.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 8cfdaa818c..fb11b3da48 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -925,7 +925,8 @@ public class DispositionServiceImpl extends ServiceBaseImpl if (asOfDateInPast && !combineSteps) { return true; - } else if (!asOfDateInPast && combineSteps) + } + else if (!asOfDateInPast && combineSteps) { return false; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 073ada2b02..ea09ba8d37 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -521,7 +521,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS { if (!details.isEventComplete()) { - HashMap properties = ((HashMap) rmNodeValues.get("properties")); + HashMap properties = (HashMap) rmNodeValues.get("properties"); properties.put("combineDispositionStepConditions", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_COMBINE_DISPOSITION_STEP_CONDITIONS)); properties.put("incompleteDispositionEvent", details.getEventName()); properties.put("dispositionEventCombination", nodeService.getProperty(dispositionService.getNextDispositionAction(nodeRef).getDispositionActionDefinition().getNodeRef(), PROP_DISPOSITION_EVENT_COMBINATION));