RM-6945: Display available actions on held active content inside a hold

- reverted allow method to be executed by non rm
This commit is contained in:
Ramona Popa
2019-09-11 11:23:53 +03:00
parent 523dad44bb
commit 9e4c04c44f
2 changed files with 8 additions and 2 deletions

View File

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

View File

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