alphabetical order for selectboxes (#510)

This commit is contained in:
Kevin Papst
2019-01-19 19:24:29 +01:00
committed by GitHub
parent a609cbf84a
commit 5b1ec1eb8f
5 changed files with 15 additions and 10 deletions

View File

@@ -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);
}

View File

@@ -99,6 +99,7 @@ class CustomerRepository extends AbstractRepository
$query = new CustomerQuery();
$query->setHiddenEntity($entity);
$query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
$query->setOrderBy('name');
return $this->findByQuery($query);
}

View File

@@ -95,6 +95,7 @@ class ProjectRepository extends AbstractRepository
$query->setHiddenEntity($entity);
$query->setCustomer($customer);
$query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER);
$query->setOrderBy('name');
return $this->findByQuery($query);
}