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

#18: Handle new audit log for groups, filter users by group

Browse Source
This commit is contained in:
jendib
2016-03-20 12:20:12 +01:00
parent 7be2e1b9e5
commit 21b3ba2bf6
9 changed files with 72 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/GroupDao.java
View File

@@ -35,7 +35,7 @@ public class GroupDao {
* Returns a group by name.
*
* @param name Name
* @return Tag
* @return Group
*/
public Group getActiveByName(String name) {
EntityManager em = ThreadLocalContext.get().getEntityManager();

5
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/UserDao.java
View File

@@ -281,6 +281,11 @@ public class UserDao {
parameterMap.put("search", "%" + criteria.getSearch() + "%");
}
if (criteria.getGroupId() != null) {
sb.append(" join T_USER_GROUP ug on ug.UGP_IDUSER_C = u.USE_ID_C and ug.UGP_IDGROUP_C = :groupId and ug.UGP_DELETEDATE_D is null ");
parameterMap.put("groupId", criteria.getGroupId());
}
criteriaList.add("u.USE_DELETEDATE_D is null");
if (!criteriaList.isEmpty()) {

14
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/criteria/UserCriteria.java
View File

@@ -10,6 +10,11 @@ public class UserCriteria {
* Search query.
*/
private String search;
/**
* Group ID.
*/
private String groupId;
public String getSearch() {
return search;
@@ -19,4 +24,13 @@ public class UserCriteria {
this.search = search;
return this;
}
public String getGroupId() {
return groupId;
}
public UserCriteria setGroupId(String groupId) {
this.groupId = groupId;
return this;
}
}