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

toolbar dropdown and visibility improvements (#933)

Browse Source
This commit is contained in:
Kevin Papst
2019-07-09 16:34:11 +02:00
committed by GitHub
parent b833e1ce27
commit c33a87a07c
74 changed files with 1317 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Form/ActivityEditForm.php
View File

@@ -15,6 +15,8 @@ use App\Form\Type\CustomerType;
use App\Form\Type\ProjectType;
use App\Repository\CustomerRepository;
use App\Repository\ProjectRepository;
use App\Repository\Query\CustomerFormTypeQuery;
use App\Repository\Query\ProjectFormTypeQuery;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -66,7 +68,7 @@ class ActivityEditForm extends AbstractType
$builder
->add('customer', CustomerType::class, [
'query_builder' => function (CustomerRepository $repo) use ($customer) {
return $repo->builderForEntityType($customer);
return $repo->getQueryBuilderForFormType(new CustomerFormTypeQuery($customer));
},
'data' => $customer ? $customer : null,
'required' => false,
@@ -79,7 +81,7 @@ class ActivityEditForm extends AbstractType
->add('project', ProjectType::class, [
'required' => false,
'query_builder' => function (ProjectRepository $repo) use ($project, $customer) {
return $repo->builderForEntityType($project, $customer);
return $repo->getQueryBuilderForFormType(new ProjectFormTypeQuery($project, $customer));
},
]);
@@ -95,7 +97,7 @@ class ActivityEditForm extends AbstractType
$event->getForm()->add('project', ProjectType::class, [
'group_by' => null,
'query_builder' => function (ProjectRepository $repo) use ($data, $project) {
return $repo->builderForEntityType($project, $data['customer']);
return $repo->getQueryBuilderForFormType(new ProjectFormTypeQuery($project, $data['customer']));
},
]);
}