Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-deck.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authordesperateCoder <echotodevnull@gmail.com>2020-08-02 19:27:22 +0300
committerNiedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com>2020-08-09 17:34:18 +0300
commit41a95f1df4881be9397a5180fb7e05286c4b9453 (patch)
tree6ac0c1d877b0e0e3387880350bbfed8e987af9c5 /app
parentc7788ffc7f997d5e220d46afff4ab93d7a55715a (diff)
#492 #631 show group member in user-selection
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java
index 1d14a276a..6febbe00f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java
@@ -79,8 +79,9 @@ public interface UserDao extends GenericDao<User> {
" AND" +
" (" +
" EXISTS (" +
- " select 1 from accesscontrol" +
- " where userId = u.localId and boardId = :boardId" +
+ " select 1 from accesscontrol" + // v GROUP!
+ " where userId = u.localId and boardId = :boardId " +
+ " OR (type = 1 and exists(select 1 from UserInGroup uig where uig.memberId = u.localId and uig.groupId = userId))" +
" )" +
" OR" +
" EXISTS (" +