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

#20: Display logs on documents

Browse Source
This commit is contained in:
jendib
2015-05-23 19:16:38 +02:00
parent ea4e3fd8f2
commit 6add34bb33
10 changed files with 117 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/AuditLogDao.java
View File

@@ -75,6 +75,7 @@ public class AuditLogDao {
if (criteria.getUserId() != null) {
StringBuilder sb0 = new StringBuilder(" (l.LOG_IDENTITY_C = :userId and l.LOG_CLASSENTITY_C = 'User' ");
sb0.append(" or l.LOG_IDENTITY_C in (select t.TAG_ID_C from T_TAG t where t.TAG_IDUSER_C = :userId) and l.LOG_CLASSENTITY_C = 'Tag' ");
// Show only logs from owned documents, ACL are lost on delete
sb0.append(" or l.LOG_IDENTITY_C in (select d.DOC_ID_C from T_DOCUMENT d where d.DOC_IDUSER_C = :userId) and l.LOG_CLASSENTITY_C = 'Document') ");
criteriaList.add(sb0.toString());
parameterMap.put("userId", criteria.getUserId());