inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2)

Browse Source 
137931 anechifor: REPO-2555 audit-entries added include


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2017-07-12 12:11:16 +00:00
parent 1b35b79dfa
commit a04d774ff6
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/rest/api/Audit.java
View File

@@ -47,6 +47,7 @@ public interface Audit
String CREATED_BY_USER = "createdByUser"; String CREATED_BY_USER = "createdByUser";
String CREATED_AT = "createdAt"; String CREATED_AT = "createdAt";
String ID = "id"; String ID = "id";
String PARAM_INCLUDE_VALUES = "values";
/** /**
* Gets a single audit application by id * Gets a single audit application by id

17
source/java/org/alfresco/rest/api/impl/AuditImpl.java
View File

@@ -195,7 +195,7 @@ public class AuditImpl implements Audit
// filtering via "where" clause // filtering via "where" clause
AuditEntryQueryWalker propertyWalker = new AuditEntryQueryWalker(); AuditEntryQueryWalker propertyWalker = new AuditEntryQueryWalker();
QueryHelper.walk(q, propertyWalker); QueryHelper.walk(q, propertyWalker);
entriesAudit = getQueryResultAuditEntries(auditAppId, propertyWalker, MAX_ITEMS_AUDIT_ENTRIES, forward); entriesAudit = getQueryResultAuditEntries(auditAppId, propertyWalker, parameters.getInclude(), MAX_ITEMS_AUDIT_ENTRIES, forward);
} }
// clear null elements // clear null elements
@@ -337,11 +337,13 @@ public class AuditImpl implements Audit
* *
* @param auditAppId * @param auditAppId
* @param propertyWalker * @param propertyWalker
* @param includeParams
* @param maxItem * @param maxItem
* @param forward * @param forward
* @return * @return
*/ */
public List<AuditEntry> getQueryResultAuditEntries(String auditAppId, AuditEntryQueryWalker propertyWalker, int maxItem, Boolean forward) public List<AuditEntry> getQueryResultAuditEntries(String auditAppId, AuditEntryQueryWalker propertyWalker, List<String> includeParam,
int maxItem, Boolean forward)
{ {
final List<AuditEntry> results = new ArrayList<AuditEntry>(); final List<AuditEntry> results = new ArrayList<AuditEntry>();
AuditApplication auditApplication = findAuditAppById(auditAppId); AuditApplication auditApplication = findAuditAppById(auditAppId);
@@ -357,15 +359,16 @@ public class AuditImpl implements Audit
params.setUser(propertyWalker.getCreatedByUser()); params.setUser(propertyWalker.getCreatedByUser());
if (propertyWalker.getFromTime() != null) if (propertyWalker.getFromTime() != null)
{ {
params.setFromTime(ISO8601DateFormat.parse(propertyWalker.getFromTime().replace(" ","+")).getTime()); params.setFromTime(ISO8601DateFormat.parse(propertyWalker.getFromTime().replace(" ", "+")).getTime());
} }
if (propertyWalker.getToTime() != null) if (propertyWalker.getToTime() != null)
{ {
params.setToTime(ISO8601DateFormat.parse(propertyWalker.getToTime().replace(" ","+")).getTime()); params.setToTime(ISO8601DateFormat.parse(propertyWalker.getToTime().replace(" ", "+")).getTime());
} }
params.setFromId(propertyWalker.getFromId()); params.setFromId(propertyWalker.getFromId());
params.setToId(propertyWalker.getToId()); params.setToId(propertyWalker.getToId());
if (propertyWalker.getValuesKey() != null && propertyWalker.getValuesValue() != null) if (propertyWalker.getValuesKey() != null && propertyWalker.getValuesValue() != null)
{ {
params.addSearchKey(propertyWalker.getValuesKey(), propertyWalker.getValuesValue()); params.addSearchKey(propertyWalker.getValuesKey(), propertyWalker.getValuesValue());
@@ -377,7 +380,11 @@ public class AuditImpl implements Audit
public boolean valuesRequired() public boolean valuesRequired()
{ {
return true; if (includeParam != null && includeParam.contains(PARAM_INCLUDE_VALUES))
{
return true;
}
return false;
} }
public boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error) public boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error)