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

---
 .../org_alfresco_module_rm/rm-ui-evaluators-context.xml   | 2 +-
 .../jscript/app/JSONConversionComponent.java              | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index 82af26b3cd..b849d1048a 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -24,7 +24,7 @@
       <property name="mimetypeService" ref="MimetypeService" />
       <property name="dispositionService" ref="dispositionService" />
       <property name="holdService" ref="HoldService" />
-      <property name="freezeService" ref="FreezeService" />
+      <property name="freezeService" ref="freezeService" />
    </bean>
 
    <!--  extends core bean with RM extensions -->
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 75fdcbb0b8..0223a57656 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
@@ -317,6 +317,8 @@ public class JSONConversionComponent extends    org.alfresco.repo.jscript.app.JS
             // Set the base root values
             super.setRootValues(nodeInfo, rootJSONObject, useShortQNames);
 
+            rootJSONObject.put("uiType", getUIType(nodeInfo.getNodeRef()));
+
             // check the existence of the RM site
             checkRmSiteExistence(rootJSONObject);
 
@@ -632,6 +634,11 @@ public class JSONConversionComponent extends    org.alfresco.repo.jscript.app.JS
     {
         String result = "unknown";
 
+        if (freezeService.isFrozen(nodeRef))
+        {
+            return "frozencontent";
+        }
+
         FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef);
         if (kind != null)
         {
@@ -699,7 +706,6 @@ public class JSONConversionComponent extends    org.alfresco.repo.jscript.app.JS
                 }
             }
         }
-
         return result;
     }