Merged branch '4.6'

ibexa · Apr 11, 2024 · 3126cd5 · 3126cd5
2 parents bde3538 + 20717d9
commit 3126cd5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/lib/Persistence/Legacy/User/Role/Gateway/DoctrineDatabase.php b/src/lib/Persistence/Legacy/User/Role/Gateway/DoctrineDatabase.php
@@ -157,7 +157,8 @@ public function loadRole(int $roleId, int $status = Role::STATUS_DEFINED): array
                 $this->buildRoleDraftQueryConstraint($status, $query)
             )
             ->orderBy('p.id', 'ASC')
-            ->addOrderBy('l.identifier', 'ASC');
+            ->addOrderBy('l.identifier', 'ASC')
+            ->addOrderBy('v.value', 'ASC');
 
         return $query->execute()->fetchAllAssociative();
     }
@@ -182,7 +183,8 @@ public function loadRoleByIdentifier(
                 $this->buildRoleDraftQueryConstraint($status, $query)
             )
             ->orderBy('p.id', 'ASC')
-            ->addOrderBy('l.identifier', 'ASC');
+            ->addOrderBy('l.identifier', 'ASC')
+            ->addOrderBy('v.value', 'ASC');
 
         return $query->execute()->fetchAllAssociative();
     }