diff --git a/src/Form/Toolbar/AbstractToolbarForm.php b/src/Form/Toolbar/AbstractToolbarForm.php index 21ac2ed0..41f201bb 100644 --- a/src/Form/Toolbar/AbstractToolbarForm.php +++ b/src/Form/Toolbar/AbstractToolbarForm.php @@ -82,7 +82,7 @@ abstract class AbstractToolbarForm extends AbstractType * @param FormBuilderInterface $builder * @param null|string $label */ - protected function addVisibilityChoice(FormBuilderInterface $builder, ?string $label = null) + protected function addVisibilityChoice(FormBuilderInterface $builder, string $label = 'label.visible') { $builder->add('visibility', VisibilityType::class, [ 'required' => false, diff --git a/src/Form/Toolbar/ActivityToolbarForm.php b/src/Form/Toolbar/ActivityToolbarForm.php index d1734620..cc56086f 100644 --- a/src/Form/Toolbar/ActivityToolbarForm.php +++ b/src/Form/Toolbar/ActivityToolbarForm.php @@ -10,6 +10,7 @@ namespace App\Form\Toolbar; use App\Repository\Query\ActivityQuery; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -25,6 +26,15 @@ class ActivityToolbarForm extends AbstractToolbarForm { $this->addPageSizeChoice($builder); $this->addVisibilityChoice($builder); + $builder->add('globalsOnly', ChoiceType::class, [ + 'choices' => [ + 'yes' => 1, + 'no' => 0, + ], + 'placeholder' => null, + 'required' => false, + 'label' => 'label.globalsOnly', + ]); $this->addCustomerChoice($builder); $this->addProjectChoice($builder); $this->addHiddenPagination($builder); diff --git a/templates/macros/widgets.html.twig b/templates/macros/widgets.html.twig index 755f2f35..eefafcdf 100644 --- a/templates/macros/widgets.html.twig +++ b/templates/macros/widgets.html.twig @@ -18,9 +18,9 @@ {% macro label_visible(visible) %} {% import _self as macro %} {% if visible %} - {{ macro.label('badge.visible', 'success') }} + {{ macro.label('yes', 'success') }} {% else %} - {{ macro.label('badge.invisible', 'default') }} + {{ macro.label('no', 'default') }} {% endif %} {% endmacro %} diff --git a/translations/messages.ar.xliff b/translations/messages.ar.xliff index b97e7f79..f038c2ac 100755 --- a/translations/messages.ar.xliff +++ b/translations/messages.ar.xliff @@ -275,14 +275,6 @@ more.info.link معلومات أخرى - - badge.visible - نعم - - - badge.invisible - لا - label.toggle_dropdown عرض القائمة diff --git a/translations/messages.de.xliff b/translations/messages.de.xliff index febc3188..a26a7e2a 100644 --- a/translations/messages.de.xliff +++ b/translations/messages.de.xliff @@ -279,14 +279,6 @@ more.info.link Mehr Infos - - badge.visible - Ja - - - badge.invisible - Nein - label.toggle_dropdown Menü anzeigen @@ -996,6 +988,10 @@ export.mark_all Alle angezeigten Einträge als abgerechnet markieren? + + label.globalsOnly + Nur globale + diff --git a/translations/messages.en.xliff b/translations/messages.en.xliff index 4afb302e..c9a26559 100644 --- a/translations/messages.en.xliff +++ b/translations/messages.en.xliff @@ -279,14 +279,6 @@ more.info.link More infos - - badge.visible - Yes - - - badge.invisible - No - label.toggle_dropdown Show menu @@ -996,6 +988,10 @@ export.mark_all Mark all shown records as cleared? + + label.globalsOnly + Only global + diff --git a/translations/messages.es.xliff b/translations/messages.es.xliff index 68fe03f0..d0832a4b 100644 --- a/translations/messages.es.xliff +++ b/translations/messages.es.xliff @@ -283,14 +283,6 @@ more.info.link Ver más... - - badge.visible - Si - - - badge.invisible - No - label.toggle_dropdown Mostrar menú diff --git a/translations/messages.fr.xliff b/translations/messages.fr.xliff index be6ec678..85ac0e07 100644 --- a/translations/messages.fr.xliff +++ b/translations/messages.fr.xliff @@ -283,14 +283,6 @@ more.info.link Plus d'infos - - badge.visible - Oui - - - badge.invisible - Non - label.toggle_dropdown Montrer le menu diff --git a/translations/messages.hu.xliff b/translations/messages.hu.xliff index 1333361e..88bda2a6 100644 --- a/translations/messages.hu.xliff +++ b/translations/messages.hu.xliff @@ -276,14 +276,6 @@ more.info.link További információ - - badge.visible - Igen - - - badge.invisible - Nem - label.toggle_dropdown Menü megjelenítése diff --git a/translations/messages.it.xliff b/translations/messages.it.xliff index 24969ca1..9a571f77 100755 --- a/translations/messages.it.xliff +++ b/translations/messages.it.xliff @@ -275,14 +275,6 @@ more.info.link Più info - - badge.visible - Si - - - badge.invisible - No - label.toggle_dropdown Mostra menù diff --git a/translations/messages.pt_BR.xliff b/translations/messages.pt_BR.xliff index 352ff900..75cb514c 100644 --- a/translations/messages.pt_BR.xliff +++ b/translations/messages.pt_BR.xliff @@ -275,14 +275,6 @@ more.info.link Mais Informações - - badge.visible - Sim - - - badge.invisible - Não - label.toggle_dropdown Mostrar menu diff --git a/translations/messages.ru.xliff b/translations/messages.ru.xliff index 3cdacd53..7d7c5170 100644 --- a/translations/messages.ru.xliff +++ b/translations/messages.ru.xliff @@ -275,14 +275,6 @@ more.info.link Подробнее - - badge.visible - Да - - - badge.invisible - Нет - label.toggle_dropdown Отобразить меню