From 3395a709007b8cbbefcb12aacd7d3899e277713c Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Tue, 7 Apr 2015 19:48:57 +0000 Subject: [PATCH] RM-1827 ("Declare" actions become available for user only after re-login) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101279 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../jscript/app/JSONConversionComponent.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 0651b02f6a..0b4f4120e8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -112,6 +112,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS /** Constants for checking the cache */ private static final String RM_SITE_EXISTS = "rmSiteExists"; private static final String RM_RECORD_CONTRIBUTORS_GROUP_MEMBERS = "rmRecordContributorsGroupMembers"; + private static final String RM_RECORD_CONTRIBUTORS_GROUP_NODE_REF = "rmRecordContributorsGroupNodeRef"; private static final String RM_SHOW_ACTIONS = "rmShowActions"; /** @@ -636,14 +637,20 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS { Set groupMembers = authorityService.getContainedAuthorities(AuthorityType.USER, AuthorityType.GROUP.getPrefixString() + recordContributorsGroupName, false); getJsonConversionComponentCache().put(RM_RECORD_CONTRIBUTORS_GROUP_MEMBERS, groupMembers); + + NodeRef recordContributorNodeRef = authorityService.getAuthorityNodeRef(AuthorityType.GROUP.getPrefixString() + recordContributorsGroupName); + getJsonConversionComponentCache().put(RM_RECORD_CONTRIBUTORS_GROUP_NODE_REF, recordContributorNodeRef); } - @SuppressWarnings("unchecked") - Set recordContributorsMembers = (Set) getJsonConversionComponentCache().get(RM_RECORD_CONTRIBUTORS_GROUP_MEMBERS); - String userName = (String) nodeService.getProperty(childAssocRef.getChildRef(), PROP_USERNAME); - if (StringUtils.isNotBlank(userName)) + if (childAssocRef.getParentRef().equals(getJsonConversionComponentCache().get(RM_RECORD_CONTRIBUTORS_GROUP_NODE_REF))) { - recordContributorsMembers.add(userName); + @SuppressWarnings("unchecked") + Set recordContributorsMembers = (Set) getJsonConversionComponentCache().get(RM_RECORD_CONTRIBUTORS_GROUP_MEMBERS); + String userName = (String) nodeService.getProperty(childAssocRef.getChildRef(), PROP_USERNAME); + if (StringUtils.isNotBlank(userName)) + { + recordContributorsMembers.add(userName); + } } } }