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

SQL and performance improvements (#2017)

Browse Source
This commit is contained in:
Kevin Papst
2020-10-23 00:31:53 +02:00
committed by GitHub
parent 6ed7ee76e7
commit 4533c994a3
14 changed files with 216 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Form/FormTrait.php
View File

@@ -105,8 +105,11 @@ trait FormTrait
$builder
->add('activity', ActivityType::class, [
'placeholder' => '',
'query_builder' => function (ActivityRepository $repo) use ($activity, $project) {
return $repo->getQueryBuilderForFormType(new ActivityFormTypeQuery($activity, $project));
'query_builder' => function (ActivityRepository $repo) use ($builder, $activity, $project) {
$query = new ActivityFormTypeQuery($activity, $project);
$query->setUser($builder->getOption('user'));
return $repo->getQueryBuilderForFormType($query);
},
])
;
@@ -114,7 +117,7 @@ trait FormTrait
// replaces the activity select after submission, to make sure only activities for the selected project are displayed
$builder->addEventListener(
FormEvents::PRE_SUBMIT,
function (FormEvent $event) use ($activity) {
function (FormEvent $event) use ($builder, $activity) {
$data = $event->getData();
if (!isset($data['project']) || empty($data['project'])) {
return;
@@ -122,8 +125,11 @@ trait FormTrait
$event->getForm()->add('activity', ActivityType::class, [
'placeholder' => '',
'query_builder' => function (ActivityRepository $repo) use ($data, $activity) {
return $repo->getQueryBuilderForFormType(new ActivityFormTypeQuery($activity, $data['project']));
'query_builder' => function (ActivityRepository $repo) use ($builder, $data, $activity) {
$query = new ActivityFormTypeQuery($activity, $data['project']);
$query->setUser($builder->getOption('user'));
return $repo->getQueryBuilderForFormType($query);
},
]);
}