From fe2112a81d496ae4f052f3ab95c01b2eda5ca43c Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Wed, 27 Nov 2019 05:55:29 +0000 Subject: [PATCH 1/3] RM-7068 restrict items in delete hold error msg --- .../org_alfresco_module_rm/hold/HoldServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java index 258d3124b6..0fa8527d1a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java @@ -39,6 +39,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Stream; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; @@ -104,6 +105,9 @@ public class HoldServiceImpl extends ServiceBaseImpl private static final String MSG_ERR_HOLD_PERMISSION_GENERIC_ERROR = "rm.hold.generic-permission-error"; private static final String MSG_ERR_HOLD_PERMISSION_DETAILED_ERROR = "rm.hold.detailed-permission-error"; + /** Maximum number of held items to display in error message */ + private static final int MAX_HELD_ITEMS_LIST_SIZE = 5; + /** File Plan Service */ private FilePlanService filePlanService; @@ -570,13 +574,13 @@ public class HoldServiceImpl extends ServiceBaseImpl if (heldNames.size() > 0) { StringBuilder sb = new StringBuilder(); - for (String name : heldNames) - { + Stream stream1 = heldNames.stream(); + stream1.limit(MAX_HELD_ITEMS_LIST_SIZE).forEach((name) -> { sb.append("\n "); sb.append("'"); sb.append(name); sb.append("'"); - } + }); throw new AccessDeniedException(I18NUtil.getMessage(MSG_ERR_HOLD_PERMISSION_DETAILED_ERROR) + sb.toString()); } From 2421c46f3cc62a96b4d96ec46c1345da32d00d61 Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Wed, 27 Nov 2019 05:58:00 +0000 Subject: [PATCH 2/3] RM-7068 remove unused import statement --- .../module/org_alfresco_module_rm/hold/HoldServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java index 0fa8527d1a..6b7d774e3f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java @@ -44,7 +44,6 @@ import java.util.stream.Stream; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService; -import org.alfresco.module.org_alfresco_module_rm.audit.event.AuditEvent; import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService; import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; From 3d3037b4b11c1a1a2535e6ae6a59723658416ee6 Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Thu, 28 Nov 2019 01:45:40 +0000 Subject: [PATCH 3/3] RM-7068 updates from review --- .../org_alfresco_module_rm/messages/hold-service.properties | 2 +- .../module/org_alfresco_module_rm/hold/HoldServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service.properties index 35662dcd2c..0c8921f747 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service.properties @@ -7,4 +7,4 @@ rm.hold.delete-node-frozen-children=Can't delete folder because it contains froz rm.hold.move-frozen-node=Frozen content can't be moved. rm.hold.update-frozen-node=Frozen content can't be updated. rm.hold.generic-permission-error=Can't delete hold, because you don't have the correct permissions for all the items within the hold. -rm.hold.detailed-permission-error=Can't delete hold, because filing permissions for the following items are needed: \ No newline at end of file +rm.hold.detailed-permission-error=Can't delete hold, because filing permissions for at least the following items are needed: \ No newline at end of file diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java index 6b7d774e3f..756dda7b85 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java @@ -574,7 +574,7 @@ public class HoldServiceImpl extends ServiceBaseImpl { StringBuilder sb = new StringBuilder(); Stream stream1 = heldNames.stream(); - stream1.limit(MAX_HELD_ITEMS_LIST_SIZE).forEach((name) -> { + stream1.limit(MAX_HELD_ITEMS_LIST_SIZE).forEach(name -> { sb.append("\n "); sb.append("'"); sb.append(name);