Merge branch 'feature/RM-5234_AuditEventsFilter_fp' into 'master'

RM-5234 Fix Login filter

See merge request records-management/records-management!971
This commit is contained in:
Roxana Lucanu
2018-04-30 19:01:18 +01:00

View File

@@ -1106,9 +1106,20 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
auditQueryParams.addSearchKey(RM_AUDIT_DATA_NODE_NODEREF, nodeRef); auditQueryParams.addSearchKey(RM_AUDIT_DATA_NODE_NODEREF, nodeRef);
} }
else if (params.getEvent() != null) else if (params.getEvent() != null)
{
if (params.getEvent().equalsIgnoreCase(RM_AUDIT_EVENT_LOGIN_SUCCESS))
{
auditQueryParams.addSearchKey(RM_AUDIT_DATA_LOGIN_FULLNAME, null);
}
else if (params.getEvent().equalsIgnoreCase(RM_AUDIT_EVENT_LOGIN_FAILURE))
{
auditQueryParams.addSearchKey(RM_AUDIT_DATA_LOGIN_ERROR, null);
}
else
{ {
auditQueryParams.addSearchKey(RM_AUDIT_DATA_EVENT_NAME, params.getEvent()); auditQueryParams.addSearchKey(RM_AUDIT_DATA_EVENT_NAME, params.getEvent());
} }
}
// Get audit entries // Get audit entries
SiteInfo siteInfo = siteService.getSite(DEFAULT_SITE_NAME); SiteInfo siteInfo = siteService.getSite(DEFAULT_SITE_NAME);