From 9a11075f418a658098de27ca7d4b1df38a70cf31 Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Tue, 4 Jul 2023 17:01:37 +0200 Subject: [PATCH] ACS-5506 Proper description storage --- .../alfresco/rest/api/impl/GroupsImpl.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java index 865ceb93f6..294d0ed618 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java @@ -161,13 +161,12 @@ public class GroupsImpl implements Groups if (group.getDescription() != null && !group.getDescription().isEmpty()) { - NodeRef groupNodeRef = authorityService.getAuthorityNodeRef(authorityDisplayName); + NodeRef groupNodeRef = authorityService.getAuthorityNodeRef(authority); Node groupNode = nodes.getNode(groupNodeRef.getId()); Map props = groupNode.getProperties(); - if (props != null) - { - props.put("cm:description", group.getDescription()); - } + props = props == null ? new HashMap<>() : props; + props.put("cm:description", group.getDescription()); + groupNode.setProperties(props); } return getGroup(authority, parameters); @@ -189,13 +188,12 @@ public class GroupsImpl implements Groups if (group.getDescription() != null && !group.getDescription().isEmpty()) { - NodeRef groupNodeRef = authorityService.getAuthorityNodeRef(group.getDisplayName()); + NodeRef groupNodeRef = authorityService.getAuthorityNodeRef(authorityService.getName(AuthorityType.GROUP, groupId)); Node groupNode = nodes.getNode(groupNodeRef.getId()); Map props = groupNode.getProperties(); - if (props != null) - { - props.put("cm:description", group.getDescription()); - } + props = props == null ? new HashMap<>() : props; + props.put("cm:description", group.getDescription()); + groupNode.setProperties(props); } return getGroup(groupId, parameters); @@ -616,7 +614,7 @@ public class GroupsImpl implements Groups group.setIsRoot(isRootAuthority(rootAuthorities, authorityInfo.getAuthorityName())); group.setHasSubgroups(!authorityService.getContainedAuthorities(AuthorityType.GROUP, authorityInfo.getAuthorityName(), true).isEmpty()); - NodeRef groupNodeRef = authorityService.getAuthorityNodeRef(authorityDisplayName); + NodeRef groupNodeRef = authorityService.getAuthorityNodeRef(authorityInfo.getAuthorityName()); Node groupNode = nodes.getNode(groupNodeRef.getId()); Map props = groupNode.getProperties(); String description = "";