inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- allow method to be executed by non rm
This commit is contained in:
Ramona Popa
2019-09-10 23:00:53 +03:00
parent 89d685f2c3
commit 041bc9071b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -908,7 +908,7 @@
<value> <value>
<![CDATA[ <![CDATA[
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.isHold=RM_ALLOW 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.getFrozen=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.freeze=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 org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService.unFreeze=RM_ALLOW

9
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
View File

@@ -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); List<NodeRef> holds = holdService.heldBy(nodeRef, false);
if (!CollectionUtils.isEmpty(holds)) if (!CollectionUtils.isEmpty(holds))
{ {
@@ -365,10 +370,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS
break; break;
} }
} }
if (freezeService.isFrozen(nodeRef))
{
rootJSONObject.put(IS_FROZEN_ACTIVE_CONTENT, true);
}
} }
} }
} }