fix tag query to show all tags of an item, even if not included in query (#810)

This commit is contained in:
Kevin Papst
2019-05-25 16:27:01 +02:00
committed by GitHub
parent 46905e9504
commit d18019159b
3 changed files with 23 additions and 15 deletions

View File

@@ -383,9 +383,10 @@ class TimesheetRepository extends AbstractRepository
}
}
if ($query->hasTags()) {
$qb->andWhere('tags.id IN (:tags)')
->setParameter('tags', $query->getTags()->toArray());
$tags = $query->getTags();
if (!empty($tags)) {
$qb->andWhere($qb->expr()->isMemberOf(':tags', 't.tags'))
->setParameter('tags', $query->getTags());
}
return $this->getBaseQueryResult($qb, $query);