Merge pull request #24 from tdeuling/master

[BUGFIX] Avoid displaying deleted users in toolbar widget
josefglatz · Jan 12, 2020 · 6a08ca5 · 6a08ca5
2 parents bbe9002 + 74e592a
commit 6a08ca5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+.idea
diff --git a/Classes/Domain/Repository/BackendUserRepository.php b/Classes/Domain/Repository/BackendUserRepository.php
@@ -25,6 +25,7 @@ public function findByMultipleProperties(string $search): QueryResultInterface
         $queryBuilder->matching(
             $queryBuilder->logicalAnd([
                 $queryBuilder->equals('admin', 0),
+                $queryBuilder->equals('deleted', 0),
                 $queryBuilder->logicalOr([
                     $queryBuilder->like('username', "%$search%"),
                     $queryBuilder->like('realName', "%$search%"),
@@ -51,6 +52,7 @@ public function findNonAdmins($uids = []): QueryResultInterface
         $queryBuilder = $this->createQuery();
 
         $constraints[] = $queryBuilder->equals('admin', 0);
+        $constraints[] = $queryBuilder->equals('deleted', 0);
         if (!empty($uids)) {
             $constraints[] = $queryBuilder->in('uid', $uids);
         }