inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/RM-7047_LinkToHeldItem' into 'master'

Browse Source 
RM-7047: Link to held item from audit entry

Closes RM-7047

See merge request records-management/records-management!1300
This commit is contained in:
Ramona Popa
2019-11-26 07:00:28 +00:00
parent ae4cb95012 f3439fd917
commit 15a854138e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
View File

@@ -1521,12 +1521,6 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
setNodeName(entry, json); 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("nodeType", entry.getNodeType() == null ? "": entry.getNodeType());
json.put("event", entry.getEvent() == null ? "": getAuditEventLabel(entry.getEvent())); json.put("event", entry.getEvent() == null ? "": getAuditEventLabel(entry.getEvent()));
json.put("identifier", entry.getIdentifier() == null ? "": entry.getIdentifier()); json.put("identifier", entry.getIdentifier() == null ? "": entry.getIdentifier());
@@ -1625,6 +1619,12 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
nodeName = getNodeName(entry.getBeforeProperties(), PARENT_GROUP); nodeName = getNodeName(entry.getBeforeProperties(), PARENT_GROUP);
break; break;
case "Delete RM Object":
case "Delete Hold":
nodeName = entry.getNodeName();
json.put("deleteObject", true);
break;
default: default:
nodeName = entry.getNodeName(); nodeName = entry.getNodeName();
break; break;