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