[openmeetings] 03/09: [OPENMEETINGS-1864] basic work on display deleted users
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 03778f6619be01c89d993f235f4ca0c88c095423
Author: Maxim Solodovnik
AuthorDate: Thu Apr 12 07:54:19 2018 +0700
[OPENMEETINGS-1864] basic work on display deleted users
---
.../db/dao/IGroupAdminDataProviderDao.java | 27 --
.../apache/openmeetings/db/dao/room/RoomDao.java | 4 ++--
.../apache/openmeetings/db/dao/user/GroupDao.java | 4 ++--
.../apache/openmeetings/db/dao/user/UserDao.java | 4 ++--
.../openmeetings/web/admin/rooms/RoomForm.java | 2 +-
.../openmeetings/web/common/GeneralUserForm.java | 2 +-
.../web/data/SearchableGroupAdminDataProvider.java | 4 ++--
7 files changed, 35 insertions(+), 12 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java
index 6946af4..504fc7e 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java
@@ -33,7 +33,20 @@ public interface IGroupAdminDataProviderDao exten
* @param order - column and sort order
* @return list of instances in the range specified
*/
- List get(String search, Long adminId, int start, int count, String
order);
+ List adminGet(String search, Long adminId, int start, int count,
String order);
+
+ /**
+* Get a list of instances of {@link T}
+*
+* @param search - string search criteria to filter entities
+* @param start - the start to range to retrieve
+* @param count - maximum instance count to retrieve
+* @param order - column and sort order
+* @return list of instances in the range specified
+*/
+ default List adminGet(String search, int start, int count, String
order) {
+ return get(search, start, count, order);
+ }
/**
* Count the number of instances of {@link T}
@@ -42,5 +55,15 @@ public interface IGroupAdminDataProviderDao exten
* @param adminId - id of group admin user
* @return count of instances satisfying given search criteria
*/
- long count(String search, Long adminId);
+ long adminCount(String search, Long adminId);
+
+ /**
+* Count the number of instances of {@link T}
+*
+* @param search - string search criteria to filter entities
+* @return count of instances satisfying given search criteria
+*/
+ default long adminCount(String search) {
+ return count(search);
+ }
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index 0a3d0b1..962eb17 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -136,7 +136,7 @@ public class RoomDao implements
IGroupAdminDataProviderDao {
}
@Override
- public List get(String search, Long adminId, int start, int
count, String order) {
+ public List adminGet(String search, Long adminId, int start, int
count, String order) {
TypedQuery q =
em.createQuery(DaoHelper.getSearchQuery("RoomGroup rg, IN(rg.room)", "r", null,
search, true, true, false
, "rg.group.id IN (SELECT gu1.group.id FROM
GroupUser gu1 WHERE gu1.moderator = true AND gu1.user.id = :adminId)", order,
searchFields), Room.class);
q.setParameter("adminId", adminId);
@@ -158,7 +158,7 @@ public class RoomDao implements
IGroupAdminDataProviderDao {
}
@Override
- public long count(String search, Long adminId) {
+ public long adminCount(String search, Long adminId) {
TypedQuery q =
em.createQuery(DaoHelper.getSearchQuery("RoomGroup rg, IN(rg.room)", "r", null,
search, true, true, true
, "rg.group.id IN (SELECT gu1.group.id FROM
GroupUser gu1 WHERE gu1.moderator = true AND gu1.user.id = :adminId)", null,
searchFields), Long.class);
q.setParameter("adminId", adminId);
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
index c4f2a43..c44966f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
@@ -73,7 +73,7 @@ public class GroupDao implements
IGroupAdminDat
[openmeetings] 03/09: [OPENMEETINGS-1864] basic work on display deleted users
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit b4beda5064826ba61fbff0bbea0d731c12709d21
Author: Maxim Solodovnik
AuthorDate: Thu Apr 12 07:54:19 2018 +0700
[OPENMEETINGS-1864] basic work on display deleted users
---
.../db/dao/IGroupAdminDataProviderDao.java | 27 --
.../apache/openmeetings/db/dao/room/RoomDao.java | 4 ++--
.../apache/openmeetings/db/dao/user/GroupDao.java | 4 ++--
.../apache/openmeetings/db/dao/user/UserDao.java | 4 ++--
.../openmeetings/web/admin/rooms/RoomForm.java | 2 +-
.../openmeetings/web/common/GeneralUserForm.java | 2 +-
.../web/data/SearchableGroupAdminDataProvider.java | 4 ++--
7 files changed, 35 insertions(+), 12 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java
index 6946af4..504fc7e 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java
@@ -33,7 +33,20 @@ public interface IGroupAdminDataProviderDao exten
* @param order - column and sort order
* @return list of instances in the range specified
*/
- List get(String search, Long adminId, int start, int count, String
order);
+ List adminGet(String search, Long adminId, int start, int count,
String order);
+
+ /**
+* Get a list of instances of {@link T}
+*
+* @param search - string search criteria to filter entities
+* @param start - the start to range to retrieve
+* @param count - maximum instance count to retrieve
+* @param order - column and sort order
+* @return list of instances in the range specified
+*/
+ default List adminGet(String search, int start, int count, String
order) {
+ return get(search, start, count, order);
+ }
/**
* Count the number of instances of {@link T}
@@ -42,5 +55,15 @@ public interface IGroupAdminDataProviderDao exten
* @param adminId - id of group admin user
* @return count of instances satisfying given search criteria
*/
- long count(String search, Long adminId);
+ long adminCount(String search, Long adminId);
+
+ /**
+* Count the number of instances of {@link T}
+*
+* @param search - string search criteria to filter entities
+* @return count of instances satisfying given search criteria
+*/
+ default long adminCount(String search) {
+ return count(search);
+ }
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index f98e5ec..743b4cd 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -137,7 +137,7 @@ public class RoomDao implements
IGroupAdminDataProviderDao {
}
@Override
- public List get(String search, Long adminId, int start, int
count, String order) {
+ public List adminGet(String search, Long adminId, int start, int
count, String order) {
TypedQuery q =
em.createQuery(DaoHelper.getSearchQuery("RoomGroup rg, IN(rg.room)", "r", null,
search, true, true, false
, "rg.group.id IN (SELECT gu1.group.id FROM
GroupUser gu1 WHERE gu1.moderator = true AND gu1.user.id = :adminId)", order,
searchFields), Room.class);
q.setParameter("adminId", adminId);
@@ -159,7 +159,7 @@ public class RoomDao implements
IGroupAdminDataProviderDao {
}
@Override
- public long count(String search, Long adminId) {
+ public long adminCount(String search, Long adminId) {
TypedQuery q =
em.createQuery(DaoHelper.getSearchQuery("RoomGroup rg, IN(rg.room)", "r", null,
search, true, true, true
, "rg.group.id IN (SELECT gu1.group.id FROM
GroupUser gu1 WHERE gu1.moderator = true AND gu1.user.id = :adminId)", null,
searchFields), Long.class);
q.setParameter("adminId", adminId);
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
index c4f2a43..c44966f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
@@ -73,7 +73,7 @@ public class GroupDao implements
IGroupAdminData
