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

fix broken sql in activity admin (#506)

Browse Source 
* fix broken sql in activity admin
* pre-select customer for existing activities
This commit is contained in:
Kevin Papst
2019-01-18 14:30:20 +01:00
committed by GitHub
parent b5c4084452
commit 03421c099a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Form/ActivityEditForm.php
View File

@@ -59,6 +59,7 @@ class ActivityEditForm extends AbstractType
'query_builder' => function (CustomerRepository $repo) use ($customer) { 'query_builder' => function (CustomerRepository $repo) use ($customer) {
return $repo->builderForEntityType($customer); return $repo->builderForEntityType($customer);
}, },
'data' => $customer ? $customer : null,
'required' => false, 'required' => false,
'mapped' => false, 'mapped' => false,
'attr' => [ 'attr' => [

2
src/Repository/ActivityRepository.php
View File

@@ -206,7 +206,9 @@ class ActivityRepository extends AbstractRepository
$qb->orderBy('a.project', 'ASC'); $qb->orderBy('a.project', 'ASC');
} }
if ($or->count() > 0) {
$qb->andWhere($or); $qb->andWhere($or);
}
return $this->getBaseQueryResult($qb, $query); return $this->getBaseQueryResult($qb, $query);
} }