jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Controller/TimesheetAbstractController.php
View File

@@ -84,10 +84,11 @@ abstract class TimesheetAbstractController extends AbstractController
$query->setUser($this->getUser());
}
if ($query->hasTags()) {
$tags = $query->getTags(true);
if (!empty($tags)) {
$query->setTags(
new ArrayCollection(
$this->getDoctrine()->getRepository(Tag::class)->findIdsByTagNameList(implode(',', $query->getTags()->toArray()))
$this->getDoctrine()->getRepository(Tag::class)->findIdsByTagNameList(implode(',', $tags))
)
);
}