diff --git a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
index c6744f852..4e41a1740 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
@@ -129,25 +129,18 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
$userPickersBuilder = $builder->create('user_pickers', null, ['compound' => true]);
foreach ($helper->getUserPickers() as $name => [
- 'label' => $label, 'options' => $options
+ 'label' => $label, 'options' => $opts
]) {
- $userPicker = $userPickersBuilder->create($name, null, [
- 'compound' => true,
- 'label' => $label,
- ]);
- $userPicker->add(
+ $userPickersBuilder->add(
$name,
PickUserDynamicType::class,
[
'multiple' => true,
'label' => $label,
- ...$options,
+ ...$opts,
]
);
-
-
- $userPickersBuilder->add($userPicker);
}
$builder->add($userPickersBuilder);
diff --git a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
index fa35cdbf3..9a9a11fbd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
@@ -69,14 +69,16 @@
{% endif %}
{% if form.user_pickers is defined %}
{% set btnSubmit = 1 %}
- {% if form.user_pickers|length > 0 %}
+ {% if form.user_pickers.children|length > 0 %}
{% for name, options in form.user_pickers %}
+ {% if form.user_pickers[name].vars.label is not same as(false) %}
+ {{ form_label(form.user_pickers[name]) }}
+ {% else %}
+ {{ form_label(form.user_pickers[name].vars.label) }}
+ {% endif %}
- {% for p in form['user_pickers'][name].children %}
- {{ form_widget(p) }}
- {{ form_label(p) }}
- {% endfor %}
+ {{ form_widget(form.user_pickers[name]) }}
{% endfor %}
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
index 026c55ef6..8554b4431 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
@@ -136,7 +136,6 @@ class FilterOrderHelper
public function getUserPickerData(string $name): array
{
- dump($this->getFormData()['user_pickers']);
return $this->getFormData()['user_pickers'][$name];
}
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
index 86180d06e..d9a505dee 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
@@ -139,9 +139,9 @@ class FilterOrderHelperBuilder
foreach (
$this->userPickers as $name => [
- 'label' => $label,
- 'options' => $options
- ]
+ 'label' => $label,
+ 'options' => $options
+ ]
) {
$helper->addUserPicker($name, $label, $options);
}
diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index e60a58145..22e49704f 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -685,7 +685,7 @@ final class SingleTaskController extends AbstractController
->addSearchBox()
->addCheckbox('status', $statuses, $statuses, $statusTrans)
->addCheckbox('states', $states, ['new', 'in_progress'])
- ->addUserPicker('userPicker', 'Filter by user', ['multiple' => True, 'required' => False])
+ ->addUserPicker('userPicker', 'Filter by user', ['multiple' => true, 'required' => false])
->build();
}