[Community] fixes incomplete user roles list

claroline · Jun 6, 2023 · 4bbd8e9 · 4bbd8e9
1 parent 40f5d96
commit 4bbd8e9
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/main/community/Finder/RoleFinder.php b/src/main/community/Finder/RoleFinder.php
@@ -46,12 +46,13 @@ public function configureQueryBuilder(QueryBuilder $qb, array $searches = [], ar
             $isAdmin = true;
         }
 
-        // if not admin doesnt list platform_admin role, for security purpose
+        // if not admin, don't list platform_admin role, for security purpose
         if (!$isAdmin) {
             $qb->andWhere('obj.name != :roleAdmin');
             $qb->setParameter('roleAdmin', PlatformRoles::ADMIN);
         }
 
+        $groupJoin = false;
         $workspaceJoin = false;
 
         foreach ($searches as $filterName => $filterValue) {
@@ -74,12 +75,22 @@ public function configureQueryBuilder(QueryBuilder $qb, array $searches = [], ar
                 case 'user':
                 case 'users':
                     $qb->leftJoin('obj.users', 'ru');
-                    $qb->andWhere('ru.uuid IN (:userIds)');
+                    if (!$groupJoin) {
+                        $qb->leftJoin('obj.groups', 'g');
+                        $groupJoin = true;
+                    }
+                    $qb->leftJoin('g.users', 'gu');
+
+                    $qb->andWhere('(ru.uuid IN (:userIds) OR gu.uuid IN (:userIds))');
                     $qb->setParameter('userIds', is_array($filterValue) ? $filterValue : [$filterValue]);
                     break;
                 case 'group':
                 case 'groups':
-                    $qb->leftJoin('obj.groups', 'g');
+                    if (!$groupJoin) {
+                        $qb->leftJoin('obj.groups', 'g');
+                        $groupJoin = true;
+                    }
+
                     $qb->andWhere('g.uuid IN (:groupIds)');
                     $qb->setParameter('groupIds', is_array($filterValue) ? $filterValue : [$filterValue]);
                     break;