public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-13 17:56:20 +00:00
Code Issues Releases Wiki Activity

Close #72: Android: Audit log

Browse Source
This commit is contained in:
jendib
2016-03-12 23:25:31 +01:00
parent 5e2bd76e10
commit 24713f54e2
24 changed files with 424 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs-web/src/main/java/com/sismics/docs/rest/resource/AuditLogResource.java
View File

@@ -9,6 +9,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import com.google.common.base.Strings;
import com.sismics.docs.core.constant.PermType;
import com.sismics.docs.core.dao.jpa.AclDao;
import com.sismics.docs.core.dao.jpa.AuditLogDao;
@@ -18,7 +19,6 @@ import com.sismics.docs.core.util.jpa.PaginatedList;
import com.sismics.docs.core.util.jpa.PaginatedLists;
import com.sismics.docs.core.util.jpa.SortCriteria;
import com.sismics.rest.exception.ForbiddenClientException;
import com.sismics.rest.exception.ServerException;
import com.sismics.rest.util.JsonUtil;
/**
@@ -43,7 +43,7 @@ public class AuditLogResource extends BaseResource {
PaginatedList<AuditLogDto> paginatedList = PaginatedLists.create(20, 0);
SortCriteria sortCriteria = new SortCriteria(1, false);
AuditLogCriteria criteria = new AuditLogCriteria();
if (documentId == null) {
if (Strings.isNullOrEmpty(documentId)) {
// Search logs for a user
criteria.setUserId(principal.getId());
} else {
@@ -56,12 +56,8 @@ public class AuditLogResource extends BaseResource {
}
// Search the logs
try {
AuditLogDao auditLogDao = new AuditLogDao();
auditLogDao.findByCriteria(paginatedList, criteria, sortCriteria);
} catch (Exception e) {
throw new ServerException("SearchError", "Error searching in logs", e);
}
AuditLogDao auditLogDao = new AuditLogDao();
auditLogDao.findByCriteria(paginatedList, criteria, sortCriteria);
// Assemble the results
JsonArrayBuilder logs = Json.createArrayBuilder();

2
docs-web/src/main/webapp/src/partial/docs/directive.auditlog.html
View File

@@ -34,7 +34,7 @@
<a href="#/tag">{{ log.message }}</a>
</span>
<span ng-switch-when="User">
<a href="#/settings/account">{{ log.message }}</a>
<a href="#/user/{{ log.message }}">{{ log.message }}</a>
</span>
</span>
</td>