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..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 @@ -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")) - { - 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,12 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean nodeName = getNodeName(entry.getBeforeProperties(), PARENT_GROUP); break; + case "Delete RM Object": + case "Delete Hold": + nodeName = entry.getNodeName(); + json.put("deleteObject", true); + break; + default: nodeName = entry.getNodeName(); break;