From bc7caea25cd8a430b8cf38e1ab6e6da665692a6b Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Thu, 21 Nov 2019 14:11:57 +0200 Subject: [PATCH 1/3] RM-7047: Link to held item from audit entry - consider Delete Hold as deleteObject --- .../audit/RecordsManagementAuditServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index 4321ac0c09..fa660a11c6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -1522,7 +1522,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean setNodeName(entry, json); // TODO: Find another way for checking the event - if (entry.getEvent().equals("Delete RM Object")) + if (entry.getEvent().equals("Delete RM Object") || entry.getEvent().equals("Delete Hold")) { json.put("deleteObject", true); } From cc1a6f19719d00fec2eb6246b9a53a52658b9ebd Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Fri, 22 Nov 2019 11:27:08 +0200 Subject: [PATCH 2/3] RM-7047: Link to held item from audit entry - changes after review --- .../audit/RecordsManagementAuditServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index fa660a11c6..6ca49c210b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -1521,12 +1521,6 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean setNodeName(entry, json); - // TODO: Find another way for checking the event - if (entry.getEvent().equals("Delete RM Object") || entry.getEvent().equals("Delete Hold")) - { - json.put("deleteObject", true); - } - json.put("nodeType", entry.getNodeType() == null ? "": entry.getNodeType()); json.put("event", entry.getEvent() == null ? "": getAuditEventLabel(entry.getEvent())); json.put("identifier", entry.getIdentifier() == null ? "": entry.getIdentifier()); @@ -1625,6 +1619,16 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean nodeName = getNodeName(entry.getBeforeProperties(), PARENT_GROUP); break; + case "Delete RM Object": + nodeName = entry.getNodeName(); + json.put("deleteObject", true); + break; + + case "Delete Hold": + nodeName = entry.getNodeName(); + json.put("deleteObject", true); + break; + default: nodeName = entry.getNodeName(); break; From 7f89f150e7650a3f1d9267013fe139dcdd1cb495 Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Fri, 22 Nov 2019 14:39:19 +0200 Subject: [PATCH 3/3] RM-7047: Link to held item from audit entry - addressed review suggestions --- .../audit/RecordsManagementAuditServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index 6ca49c210b..692b63ffe6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -1620,10 +1620,6 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean break; case "Delete RM Object": - nodeName = entry.getNodeName(); - json.put("deleteObject", true); - break; - case "Delete Hold": nodeName = entry.getNodeName(); json.put("deleteObject", true);