mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
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:
@@ -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 -->
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user