alphabetical order for selectboxes (#510)

2019-01-19 19:24:29 +01:00
parent a609cbf84a
commit 5b1ec1eb8f
5 changed files with 15 additions and 10 deletions
--- a/src/Repository/ActivityRepository.php
+++ b/src/Repository/ActivityRepository.php
@@ -142,8 +142,13 @@ class ActivityRepository extends AbstractRepository
        $qb->select('a', 'p', 'c')
            ->from(Activity::class, 'a')
            ->leftJoin('a.project', 'p')
-            ->leftJoin('p.customer', 'c')
-            ->orderBy('a.' . $query->getOrderBy(), $query->getOrder());
+            ->leftJoin('p.customer', 'c');
+
+        if ($query->isOrderGlobalsFirst()) {
+            $qb->orderBy('a.project', 'ASC');
+        }
+
+        $qb->addOrderBy('a.' . $query->getOrderBy(), $query->getOrder());

        $where = $qb->expr()->andX();

@@ -202,10 +207,6 @@ class ActivityRepository extends AbstractRepository
            $qb->setParameter('activity', $entity);
        }

-        if ($query->isOrderGlobalsFirst()) {
-            $qb->orderBy('a.project', 'ASC');
-        }
-
        if ($or->count() > 0) {
            $qb->andWhere($or);
        }