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

remove invisible entities from toolbars (#628)

Browse Source
This commit is contained in:
Kevin Papst
2019-03-08 20:22:58 +01:00
committed by GitHub
parent e8bc45f7dd
commit 519be2d5a2
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Form/Toolbar/AbstractToolbarForm.php
View File

@@ -66,10 +66,8 @@ abstract class AbstractToolbarForm extends AbstractType
$builder->add('customer', CustomerType::class, [ $builder->add('customer', CustomerType::class, [
'required' => false, 'required' => false,
'project_enabled' => true, 'project_enabled' => true,
'project_visibility' => ProjectQuery::SHOW_BOTH,
'query_builder' => function (CustomerRepository $repo) { 'query_builder' => function (CustomerRepository $repo) {
$query = new CustomerQuery(); $query = new CustomerQuery();
$query->setVisibility(CustomerQuery::SHOW_BOTH); // this field is the reason for the query here
$query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER); $query->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER);
$query->setOrderBy('name'); $query->setOrderBy('name');
@@ -130,7 +128,6 @@ abstract class AbstractToolbarForm extends AbstractType
$builder->add('project', ProjectType::class, [ $builder->add('project', ProjectType::class, [
'required' => false, 'required' => false,
'activity_enabled' => true, 'activity_enabled' => true,
'activity_visibility' => ActivityQuery::SHOW_BOTH,
'choices' => [], 'choices' => [],
]); ]);
@@ -146,12 +143,10 @@ abstract class AbstractToolbarForm extends AbstractType
'group_by' => null, 'group_by' => null,
'required' => false, 'required' => false,
'activity_enabled' => true, 'activity_enabled' => true,
'activity_visibility' => ActivityQuery::SHOW_BOTH,
'query_builder' => function (ProjectRepository $repo) use ($data) { 'query_builder' => function (ProjectRepository $repo) use ($data) {
$query = new ProjectQuery(); $query = new ProjectQuery();
$query->setCustomer($data['customer']); $query->setCustomer($data['customer']);
$query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER); $query->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER);
$query->setVisibility(ProjectQuery::SHOW_BOTH);
$query->setOrderBy('name'); $query->setOrderBy('name');
return $repo->findByQuery($query); return $repo->findByQuery($query);
@@ -173,7 +168,6 @@ abstract class AbstractToolbarForm extends AbstractType
$query->setResultType(ActivityQuery::RESULT_TYPE_QUERYBUILDER); $query->setResultType(ActivityQuery::RESULT_TYPE_QUERYBUILDER);
$query->setGlobalsOnly(true); $query->setGlobalsOnly(true);
$query->setOrderGlobalsFirst(true); $query->setOrderGlobalsFirst(true);
$query->setVisibility(ActivityQuery::SHOW_BOTH);
$query->setOrderBy('name'); $query->setOrderBy('name');
return $repo->findByQuery($query); return $repo->findByQuery($query);
@@ -195,7 +189,6 @@ abstract class AbstractToolbarForm extends AbstractType
$query->setResultType(ActivityQuery::RESULT_TYPE_QUERYBUILDER); $query->setResultType(ActivityQuery::RESULT_TYPE_QUERYBUILDER);
$query->setProject($data['project']); $query->setProject($data['project']);
$query->setOrderGlobalsFirst(true); $query->setOrderGlobalsFirst(true);
$query->setVisibility(ActivityQuery::SHOW_BOTH);
$query->setOrderBy('name'); $query->setOrderBy('name');
return $repo->findByQuery($query); return $repo->findByQuery($query);