From 041bc9071b9a67d9f4b08686f7dff178ccdd5c9a Mon Sep 17 00:00:00 2001
From: Ramona Popa <Ramona.Popa@ness.com>
Date: Tue, 10 Sep 2019 23:00:53 +0300
Subject: [PATCH] RM-6945: Display available actions on held active content
 inside a hold    - allow method to be executed by non rm

---
 .../module/org_alfresco_module_rm/rm-service-context.xml | 2 +-
 .../jscript/app/JSONConversionComponent.java             | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 7b7a037aa7..1ae4de9564 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -908,7 +908,7 @@
             <value>
                 <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.isHold=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.isFrozen=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.isFrozen==ACL_ALLOW,RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.getFrozen=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.freeze=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.unFreeze=RM_ALLOW
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 40525d4486..75fdcbb0b8 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
@@ -353,6 +353,11 @@ public class JSONConversionComponent extends    org.alfresco.repo.jscript.app.JS
                 }
             }
 
+            if (freezeService.isFrozen(nodeRef))
+            {
+                rootJSONObject.put(IS_FROZEN_ACTIVE_CONTENT, true);
+            }
+
             List<NodeRef> holds = holdService.heldBy(nodeRef, false);
             if (!CollectionUtils.isEmpty(holds))
             {
@@ -365,10 +370,6 @@ public class JSONConversionComponent extends    org.alfresco.repo.jscript.app.JS
                         break;
                     }
                 }
-                if (freezeService.isFrozen(nodeRef))
-                {
-                    rootJSONObject.put(IS_FROZEN_ACTIVE_CONTENT, true);
-                }
             }
         }
     }