Merge pull request #6036 from christianbeeznest/GH-1655

User: Add ordering logic for courses and sessions list - refs #1655
chamilo · Feb 4, 2025 · d1f1a40 · d1f1a40
2 parents 59c97b1 + ef12be8
commit d1f1a40
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/assets/vue/components/social/SocialWallPostList.vue b/assets/vue/components/social/SocialWallPostList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="relative min-h-[300px]">
     <SocialWallPost
       v-for="socialPost in postList"
       :key="socialPost.id"

diff --git a/src/CoreBundle/DataProvider/Extension/CourseRelUserExtension.php b/src/CoreBundle/DataProvider/Extension/CourseRelUserExtension.php
@@ -60,20 +60,24 @@ public function applyToCollection(
             }
         }
 
-        if ($this->security->isGranted('ROLE_ADMIN')) {
-            return;
-        }
-
         if (CourseRelUser::class === $resourceClass) {
             if ('collection_query' === $operation?->getName()) {
-                /** @var User|null $user */
-                if (null === $user = $this->security->getUser()) {
-                    throw new AccessDeniedException('Access Denied.');
-                }
-
                 $rootAlias = $queryBuilder->getRootAliases()[0];
-                $queryBuilder->andWhere(\sprintf('%s.user = :current_user', $rootAlias));
-                $queryBuilder->setParameter('current_user', $user->getId());
+                $queryBuilder->leftJoin("$rootAlias.course", 'c');
+                $queryBuilder
+                    ->orderBy('c.title', 'ASC')
+                    ->addOrderBy("$rootAlias.sort", 'ASC')
+                    ->addOrderBy("$rootAlias.userCourseCat", 'ASC');
+
+                if (!$this->security->isGranted('ROLE_ADMIN')) {
+                    /** @var User|null $user */
+                    if (null === $user = $this->security->getUser()) {
+                        throw new AccessDeniedException('Access Denied.');
+                    }
+
+                    $queryBuilder->andWhere(\sprintf('%s.user = :current_user', $rootAlias));
+                    $queryBuilder->setParameter('current_user', $user->getId());
+                }
             }
         }
 

diff --git a/src/CoreBundle/Repository/SessionRepository.php b/src/CoreBundle/Repository/SessionRepository.php
@@ -78,7 +78,9 @@ public function getSessionsByUser(User $user, AccessUrl $url): QueryBuilder
                 'user' => $user,
                 'url' => $url,
             ])
-        ;
+            ->orderBy('s.displayStartDate', 'ASC')
+            ->addOrderBy('s.title', 'ASC')
+            ->addOrderBy('s.position', 'ASC');
 
         return $qb;
     }