From e61717251837489a2f90d1ce9f92be69d74293d5 Mon Sep 17 00:00:00 2001 From: tkuska Date: Mon, 1 Oct 2018 10:28:03 +0200 Subject: [PATCH 01/14] fixed display top nav menu when user does not have rights for first or last module --- src/Resources/views/Core/add_block.html.twig | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Resources/views/Core/add_block.html.twig b/src/Resources/views/Core/add_block.html.twig index b604f1c875..aff3c8af79 100644 --- a/src/Resources/views/Core/add_block.html.twig +++ b/src/Resources/views/Core/add_block.html.twig @@ -16,27 +16,29 @@ {% set column_count = (groups|length / items_per_column)|round(0, 'ceil') %}
1 %}style="width: {{ column_count*140 }}px;"{% endif %} - > + {% if column_count > 1 %}style="width: {{ column_count*140 }}px;"{% endif %} + > {% for group in groups|reverse %} {% set display = (group.roles is empty or is_granted(sonata_admin.adminPool.getOption('role_admin')) ) %} {% for role in group.roles if not display %} {% set display = is_granted(role) %} {% endfor %} - {% if display %} + {% if loop.first %} + {% set render_first_element = true %} + {% endif %} - {% if loop.first or loop.index0 % items_per_column == 0 %} - {% if loop.first %} + {% if display %} + {% if render_first_element or loop.index0 % items_per_column == 0 %} + {% if render_first_element %}
+ {% set render_first_element = false %} {% else %} - {% endif %} - + {% endif %}
    {% endif %} - {% if loop.index0 % items_per_column != 0 %} {% endif %} @@ -60,13 +62,11 @@ {% endif %} {% endif %} {% endfor %} - - {% if loop.last %} -
-
+ {% if loop.last and not render_first_element %} + +
{% endif %} - {% endif %} {% endfor %} From 990d0dfc0fe4f6e578d4e5a4eddb1d8447217031 Mon Sep 17 00:00:00 2001 From: Christian Gripp Date: Sat, 9 Mar 2019 19:30:17 +0100 Subject: [PATCH 02/14] Update src/Resources/views/Core/add_block.html.twig Co-Authored-By: tkuska --- src/Resources/views/Core/add_block.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/views/Core/add_block.html.twig b/src/Resources/views/Core/add_block.html.twig index aff3c8af79..8b0c17ea3b 100644 --- a/src/Resources/views/Core/add_block.html.twig +++ b/src/Resources/views/Core/add_block.html.twig @@ -36,7 +36,7 @@ {% set render_first_element = false %} {% else %} - {% endif %} + {% endif %}
    {% endif %} {% if loop.index0 % items_per_column != 0 %} From 3e420491e7eaea52666ef0026c51a4319fa0d7d9 Mon Sep 17 00:00:00 2001 From: Christian Gripp Date: Sat, 9 Mar 2019 19:31:00 +0100 Subject: [PATCH 03/14] Update src/Resources/views/Core/add_block.html.twig Co-Authored-By: tkuska --- src/Resources/views/Core/add_block.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/views/Core/add_block.html.twig b/src/Resources/views/Core/add_block.html.twig index 8b0c17ea3b..40ec2bc23f 100644 --- a/src/Resources/views/Core/add_block.html.twig +++ b/src/Resources/views/Core/add_block.html.twig @@ -16,7 +16,7 @@ {% set column_count = (groups|length / items_per_column)|round(0, 'ceil') %}
    1 %}style="width: {{ column_count*140 }}px;"{% endif %} + {% if column_count > 1 %}style="width: {{ column_count*140 }}px;"{% endif %} > {% for group in groups|reverse %} {% set display = (group.roles is empty or is_granted(sonata_admin.adminPool.getOption('role_admin')) ) %} From 966080d13ff1d8de418ff378475f10a3612c8518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ku=C5=9Bka?= Date: Wed, 26 Feb 2020 23:23:20 +0100 Subject: [PATCH 04/14] Added support for help_translation_parameter in FormMapper --- src/Admin/BaseFieldDescription.php | 20 +++++++++++++++++++ src/Form/FormMapper.php | 8 ++++++++ .../views/Form/form_admin_fields.html.twig | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/Admin/BaseFieldDescription.php b/src/Admin/BaseFieldDescription.php index 89fd845a79..f467f92994 100644 --- a/src/Admin/BaseFieldDescription.php +++ b/src/Admin/BaseFieldDescription.php @@ -126,6 +126,11 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface */ protected $help; + /** + * @var array the parameters to use in help message + */ + protected $helpTranslationParameters = []; + /** * @var array[] cached object field getters */ @@ -396,6 +401,21 @@ public function getHelp() return $this->help; } + /** + * Defines the help translation parameters. + * + * @param array $help + */ + public function setHelpTranslationParameters(array $helpTranslationParameters) + { + $this->helpTranslationParameters = $helpTranslationParameters; + } + + public function getHelpTranslationParameters() + { + return $this->helpTranslationParameters; + } + public function getLabel() { return $this->getOption('label'); diff --git a/src/Form/FormMapper.php b/src/Form/FormMapper.php index 806f9753f3..dcc0cde625 100644 --- a/src/Form/FormMapper.php +++ b/src/Form/FormMapper.php @@ -142,6 +142,14 @@ public function add($name, $type = null, array $options = [], array $fieldDescri if (null !== $help) { $this->admin->getFormFieldDescription($name)->setHelp($help); } + + $helpTranslationParameters = []; + if (isset($options['help_translation_parameters'])) { + $helpTranslationParameters = $options['help_translation_parameters']; + unset($options['help_translation_parameters']); + } + + $this->admin->getFormFieldDescription($name)->setHelpTranslationParameters($helpTranslationParameters); } if (!isset($fieldDescriptionOptions['role']) || $this->admin->isGranted($fieldDescriptionOptions['role'])) { diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig index eb1627d42d..fc819648ad 100644 --- a/src/Resources/views/Form/form_admin_fields.html.twig +++ b/src/Resources/views/Form/form_admin_fields.html.twig @@ -401,7 +401,7 @@ file that was distributed with this source code. {% endif %} {% if sonata_admin is defined and sonata_admin_enabled and sonata_admin.field_description.help|default(false) %} - {{ sonata_admin.field_description.help|trans({}, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} + {{ sonata_admin.field_description.help|trans(sonata_admin.field_description.helpTranslationParameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} {% endif %} {{ form_help(form) }} From 17e23de65e3fe0d1bbd958122b429906e659bfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ku=C5=9Bka?= Date: Thu, 16 Jul 2020 21:52:21 +0200 Subject: [PATCH 05/14] refactored support for help_translation_parameters and added label_translation_parameters --- src/Admin/BaseFieldDescription.php | 20 ------------------- src/Form/FormMapper.php | 8 -------- .../views/Form/form_admin_fields.html.twig | 6 +++--- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/src/Admin/BaseFieldDescription.php b/src/Admin/BaseFieldDescription.php index f467f92994..89fd845a79 100644 --- a/src/Admin/BaseFieldDescription.php +++ b/src/Admin/BaseFieldDescription.php @@ -126,11 +126,6 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface */ protected $help; - /** - * @var array the parameters to use in help message - */ - protected $helpTranslationParameters = []; - /** * @var array[] cached object field getters */ @@ -401,21 +396,6 @@ public function getHelp() return $this->help; } - /** - * Defines the help translation parameters. - * - * @param array $help - */ - public function setHelpTranslationParameters(array $helpTranslationParameters) - { - $this->helpTranslationParameters = $helpTranslationParameters; - } - - public function getHelpTranslationParameters() - { - return $this->helpTranslationParameters; - } - public function getLabel() { return $this->getOption('label'); diff --git a/src/Form/FormMapper.php b/src/Form/FormMapper.php index dcc0cde625..806f9753f3 100644 --- a/src/Form/FormMapper.php +++ b/src/Form/FormMapper.php @@ -142,14 +142,6 @@ public function add($name, $type = null, array $options = [], array $fieldDescri if (null !== $help) { $this->admin->getFormFieldDescription($name)->setHelp($help); } - - $helpTranslationParameters = []; - if (isset($options['help_translation_parameters'])) { - $helpTranslationParameters = $options['help_translation_parameters']; - unset($options['help_translation_parameters']); - } - - $this->admin->getFormFieldDescription($name)->setHelpTranslationParameters($helpTranslationParameters); } if (!isset($fieldDescriptionOptions['role']) || $this->admin->isGranted($fieldDescriptionOptions['role'])) { diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig index fc819648ad..e3565b4feb 100644 --- a/src/Resources/views/Form/form_admin_fields.html.twig +++ b/src/Resources/views/Form/form_admin_fields.html.twig @@ -156,9 +156,9 @@ file that was distributed with this source code. {% if translation_domain is same as(false) %} {{- label -}} {% elseif not sonata_admin.admin %} - {{- label|trans({}, translation_domain) -}} + {{- label|trans(label_translation_parameters, translation_domain) -}} {% else %} - {{ label|trans({}, sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} + {{ label|trans(label_translation_parameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} {% endif %} {% endif %} @@ -401,7 +401,7 @@ file that was distributed with this source code. {% endif %} {% if sonata_admin is defined and sonata_admin_enabled and sonata_admin.field_description.help|default(false) %} - {{ sonata_admin.field_description.help|trans(sonata_admin.field_description.helpTranslationParameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} + {{ sonata_admin.field_description.help|trans(help_translation_parameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} {% endif %} {{ form_help(form) }} From ecea79be71861a6b6805796d53fd57dc01c25cb9 Mon Sep 17 00:00:00 2001 From: tkuska Date: Mon, 1 Oct 2018 10:28:03 +0200 Subject: [PATCH 06/14] fixed display top nav menu when user does not have rights for first or last module --- src/Resources/views/Core/add_block.html.twig | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Resources/views/Core/add_block.html.twig b/src/Resources/views/Core/add_block.html.twig index 7eada64fdf..aff3c8af79 100644 --- a/src/Resources/views/Core/add_block.html.twig +++ b/src/Resources/views/Core/add_block.html.twig @@ -2,17 +2,27 @@ {% set items_per_column = sonata_admin.adminPool.getOption('dropdown_number_groups_per_colums') %} {% set groups = [] %} - {% for group in sonata_admin.adminPool.dashboardgroups|filter(group => group.items|filter(admin => admin.hasRoute('create') and admin.hasAccess('create'))|length > 0) %} - {% set groups = [group]|merge(groups) %} + {% for group in sonata_admin.adminPool.dashboardgroups %} + {% set display_group = false %} + + {% for admin in group.items if display_group == false %} + {% if admin.hasRoute('create') and admin.hasAccess('create') %} + {% set display_group = true %} + {% set groups = [group]|merge(groups) %} + {% endif %} + {% endfor %} {% endfor %} {% set column_count = (groups|length / items_per_column)|round(0, 'ceil') %}
    1 %}style="width: {{ column_count*140 }}px;"{% endif %} + {% if column_count > 1 %}style="width: {{ column_count*140 }}px;"{% endif %} > {% for group in groups|reverse %} - {% set display = group.roles is empty or is_granted(sonata_admin.adminPool.getOption('role_admin')) or group.roles|filter(role => is_granted(role))|length > 0 %} + {% set display = (group.roles is empty or is_granted(sonata_admin.adminPool.getOption('role_admin')) ) %} + {% for role in group.roles if not display %} + {% set display = is_granted(role) %} + {% endfor %} {% if loop.first %} {% set render_first_element = true %} @@ -26,7 +36,7 @@ {% set render_first_element = false %} {% else %}
- {% endif %} + {% endif %}
    {% endif %} {% if loop.index0 % items_per_column != 0 %} @@ -41,7 +51,7 @@ {% if admin.hasRoute('create') and admin.hasAccess('create') %} {% if admin.subClasses is empty %}
  • - {{ admin.label|trans({}, admin.translationdomain) }} + {{ admin.label|trans({}, admin.translationdomain) }}
    • {% else %} {% for subclass in admin.subclasses|keys %} From 25579746e04224b3f0ddd9faf00755d0887e7b55 Mon Sep 17 00:00:00 2001 From: Christian Gripp Date: Sat, 9 Mar 2019 19:30:17 +0100 Subject: [PATCH 07/14] Update src/Resources/views/Core/add_block.html.twig Co-Authored-By: tkuska --- src/Resources/views/Core/add_block.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/views/Core/add_block.html.twig b/src/Resources/views/Core/add_block.html.twig index aff3c8af79..8b0c17ea3b 100644 --- a/src/Resources/views/Core/add_block.html.twig +++ b/src/Resources/views/Core/add_block.html.twig @@ -36,7 +36,7 @@ {% set render_first_element = false %} {% else %}
- {% endif %} + {% endif %}
    {% endif %} {% if loop.index0 % items_per_column != 0 %} From 73bce6c8351cd289a3107933f6a71698a469ba23 Mon Sep 17 00:00:00 2001 From: Christian Gripp Date: Sat, 9 Mar 2019 19:31:00 +0100 Subject: [PATCH 08/14] Update src/Resources/views/Core/add_block.html.twig Co-Authored-By: tkuska --- src/Resources/views/Core/add_block.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/views/Core/add_block.html.twig b/src/Resources/views/Core/add_block.html.twig index 8b0c17ea3b..40ec2bc23f 100644 --- a/src/Resources/views/Core/add_block.html.twig +++ b/src/Resources/views/Core/add_block.html.twig @@ -16,7 +16,7 @@ {% set column_count = (groups|length / items_per_column)|round(0, 'ceil') %}
    1 %}style="width: {{ column_count*140 }}px;"{% endif %} + {% if column_count > 1 %}style="width: {{ column_count*140 }}px;"{% endif %} > {% for group in groups|reverse %} {% set display = (group.roles is empty or is_granted(sonata_admin.adminPool.getOption('role_admin')) ) %} From 7a78cb70d3e9f76fe0a76b20421ae2da878d1a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ku=C5=9Bka?= Date: Wed, 26 Feb 2020 23:23:20 +0100 Subject: [PATCH 09/14] Added support for help_translation_parameter in FormMapper --- src/Admin/BaseFieldDescription.php | 20 +++++++++++++++++++ .../views/Form/form_admin_fields.html.twig | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Admin/BaseFieldDescription.php b/src/Admin/BaseFieldDescription.php index 77ec3f7235..879eb2004d 100644 --- a/src/Admin/BaseFieldDescription.php +++ b/src/Admin/BaseFieldDescription.php @@ -127,6 +127,11 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface */ protected $help; + /** + * @var array the parameters to use in help message + */ + protected $helpTranslationParameters = []; + /** * @var array[] cached object field getters */ @@ -460,6 +465,21 @@ public function getHelp() return $this->help; } + /** + * Defines the help translation parameters. + * + * @param array $help + */ + public function setHelpTranslationParameters(array $helpTranslationParameters) + { + $this->helpTranslationParameters = $helpTranslationParameters; + } + + public function getHelpTranslationParameters() + { + return $this->helpTranslationParameters; + } + public function getLabel() { $label = $this->getOption('label'); diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig index eb1627d42d..fc819648ad 100644 --- a/src/Resources/views/Form/form_admin_fields.html.twig +++ b/src/Resources/views/Form/form_admin_fields.html.twig @@ -401,7 +401,7 @@ file that was distributed with this source code. {% endif %} {% if sonata_admin is defined and sonata_admin_enabled and sonata_admin.field_description.help|default(false) %} - {{ sonata_admin.field_description.help|trans({}, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} + {{ sonata_admin.field_description.help|trans(sonata_admin.field_description.helpTranslationParameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} {% endif %} {{ form_help(form) }} From 71f0d66a6278a76afcf83ddd77061df10e2b4602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ku=C5=9Bka?= Date: Thu, 16 Jul 2020 21:52:21 +0200 Subject: [PATCH 10/14] refactored support for help_translation_parameters and added label_translation_parameters --- src/Admin/BaseFieldDescription.php | 20 ------------------- .../views/Form/form_admin_fields.html.twig | 6 +++--- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/Admin/BaseFieldDescription.php b/src/Admin/BaseFieldDescription.php index 879eb2004d..77ec3f7235 100644 --- a/src/Admin/BaseFieldDescription.php +++ b/src/Admin/BaseFieldDescription.php @@ -127,11 +127,6 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface */ protected $help; - /** - * @var array the parameters to use in help message - */ - protected $helpTranslationParameters = []; - /** * @var array[] cached object field getters */ @@ -465,21 +460,6 @@ public function getHelp() return $this->help; } - /** - * Defines the help translation parameters. - * - * @param array $help - */ - public function setHelpTranslationParameters(array $helpTranslationParameters) - { - $this->helpTranslationParameters = $helpTranslationParameters; - } - - public function getHelpTranslationParameters() - { - return $this->helpTranslationParameters; - } - public function getLabel() { $label = $this->getOption('label'); diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig index fc819648ad..e3565b4feb 100644 --- a/src/Resources/views/Form/form_admin_fields.html.twig +++ b/src/Resources/views/Form/form_admin_fields.html.twig @@ -156,9 +156,9 @@ file that was distributed with this source code. {% if translation_domain is same as(false) %} {{- label -}} {% elseif not sonata_admin.admin %} - {{- label|trans({}, translation_domain) -}} + {{- label|trans(label_translation_parameters, translation_domain) -}} {% else %} - {{ label|trans({}, sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} + {{ label|trans(label_translation_parameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} {% endif %} {% endif %} @@ -401,7 +401,7 @@ file that was distributed with this source code. {% endif %} {% if sonata_admin is defined and sonata_admin_enabled and sonata_admin.field_description.help|default(false) %} - {{ sonata_admin.field_description.help|trans(sonata_admin.field_description.helpTranslationParameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} + {{ sonata_admin.field_description.help|trans(help_translation_parameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} {% endif %} {{ form_help(form) }} From 62db01c971afd459e34990475dd006623882c0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ku=C5=9Bka?= Date: Fri, 17 Jul 2020 14:47:48 +0200 Subject: [PATCH 11/14] Restored changes after rebase... Added access to help_tranlslation_parameters and label_translation_parameters to fieldDescription --- src/Admin/BaseFieldDescription.php | 10 ++++++++++ src/Form/FormMapper.php | 11 +++++++++++ src/Resources/views/Form/form_admin_fields.html.twig | 4 ++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/Admin/BaseFieldDescription.php b/src/Admin/BaseFieldDescription.php index 77ec3f7235..d2a11b70e1 100644 --- a/src/Admin/BaseFieldDescription.php +++ b/src/Admin/BaseFieldDescription.php @@ -460,6 +460,16 @@ public function getHelp() return $this->help; } + public function getHelpTranslationParameters() + { + return $this->getOption('help_translation_parameters'); + } + + public function getLabelTranslationParameters() + { + return $this->getOption('label_translation_parameters'); + } + public function getLabel() { $label = $this->getOption('label'); diff --git a/src/Form/FormMapper.php b/src/Form/FormMapper.php index 49d3b32be8..e47d25b0ff 100644 --- a/src/Form/FormMapper.php +++ b/src/Form/FormMapper.php @@ -136,10 +136,21 @@ public function add($name, $type = null, array $options = [], array $fieldDescri $options['label'] = $this->admin->getLabelTranslatorStrategy()->getLabel($name, 'form', 'label'); } + if (isset($options['label_translation_parameters'])) { + $fieldDescription->setOption('label_translation_parameters', $options['label_translation_parameters']); + unset($options['help']); + } + if (isset($options['help'])) { $fieldDescription->setHelp($options['help']); unset($options['help']); } + + + if (isset($options['help_translation_parameters'])) { + $fieldDescription->setOption('help_translation_parameters', $options['help_translation_parameters']); + unset($options['help']); + } } $this->admin->addFormFieldDescription($fieldName, $fieldDescription); diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig index e3565b4feb..fb1f4b5843 100644 --- a/src/Resources/views/Form/form_admin_fields.html.twig +++ b/src/Resources/views/Form/form_admin_fields.html.twig @@ -158,7 +158,7 @@ file that was distributed with this source code. {% elseif not sonata_admin.admin %} {{- label|trans(label_translation_parameters, translation_domain) -}} {% else %} - {{ label|trans(label_translation_parameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} + {{ label|trans(sonata_admin.field_description.labelTranslationParameters|default({}), sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} {% endif %} {% endif %} @@ -401,7 +401,7 @@ file that was distributed with this source code. {% endif %} {% if sonata_admin is defined and sonata_admin_enabled and sonata_admin.field_description.help|default(false) %} - {{ sonata_admin.field_description.help|trans(help_translation_parameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} + {{ sonata_admin.field_description.help|trans(sonata_admin.field_description.helpTranslationParameters|default({}), sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} {% endif %} {{ form_help(form) }} From 97bd74248dce3fda03f6f949de6e19e025548740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ku=C5=9Bka?= Date: Fri, 17 Jul 2020 15:03:30 +0200 Subject: [PATCH 12/14] Fixed mess i've done during rebase --- src/Resources/views/Core/add_block.html.twig | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/Resources/views/Core/add_block.html.twig b/src/Resources/views/Core/add_block.html.twig index 40ec2bc23f..7eada64fdf 100644 --- a/src/Resources/views/Core/add_block.html.twig +++ b/src/Resources/views/Core/add_block.html.twig @@ -2,15 +2,8 @@ {% set items_per_column = sonata_admin.adminPool.getOption('dropdown_number_groups_per_colums') %} {% set groups = [] %} - {% for group in sonata_admin.adminPool.dashboardgroups %} - {% set display_group = false %} - - {% for admin in group.items if display_group == false %} - {% if admin.hasRoute('create') and admin.hasAccess('create') %} - {% set display_group = true %} - {% set groups = [group]|merge(groups) %} - {% endif %} - {% endfor %} + {% for group in sonata_admin.adminPool.dashboardgroups|filter(group => group.items|filter(admin => admin.hasRoute('create') and admin.hasAccess('create'))|length > 0) %} + {% set groups = [group]|merge(groups) %} {% endfor %} {% set column_count = (groups|length / items_per_column)|round(0, 'ceil') %} @@ -19,10 +12,7 @@ {% if column_count > 1 %}style="width: {{ column_count*140 }}px;"{% endif %} > {% for group in groups|reverse %} - {% set display = (group.roles is empty or is_granted(sonata_admin.adminPool.getOption('role_admin')) ) %} - {% for role in group.roles if not display %} - {% set display = is_granted(role) %} - {% endfor %} + {% set display = group.roles is empty or is_granted(sonata_admin.adminPool.getOption('role_admin')) or group.roles|filter(role => is_granted(role))|length > 0 %} {% if loop.first %} {% set render_first_element = true %} @@ -51,7 +41,7 @@ {% if admin.hasRoute('create') and admin.hasAccess('create') %} {% if admin.subClasses is empty %}
  • - {{ admin.label|trans({}, admin.translationdomain) }} + {{ admin.label|trans({}, admin.translationdomain) }}
    • {% else %} {% for subclass in admin.subclasses|keys %} From d063a180c6b79abf6c8411b9294e2be84185181b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ku=C5=9Bka?= Date: Fri, 17 Jul 2020 15:20:06 +0200 Subject: [PATCH 13/14] fixed some "unset" issues and removed getters in FieldDescription --- src/Admin/BaseFieldDescription.php | 10 ---------- src/Form/FormMapper.php | 4 ++-- src/Resources/views/Form/form_admin_fields.html.twig | 4 ++-- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/Admin/BaseFieldDescription.php b/src/Admin/BaseFieldDescription.php index d2a11b70e1..77ec3f7235 100644 --- a/src/Admin/BaseFieldDescription.php +++ b/src/Admin/BaseFieldDescription.php @@ -460,16 +460,6 @@ public function getHelp() return $this->help; } - public function getHelpTranslationParameters() - { - return $this->getOption('help_translation_parameters'); - } - - public function getLabelTranslationParameters() - { - return $this->getOption('label_translation_parameters'); - } - public function getLabel() { $label = $this->getOption('label'); diff --git a/src/Form/FormMapper.php b/src/Form/FormMapper.php index e47d25b0ff..9bbecd0d36 100644 --- a/src/Form/FormMapper.php +++ b/src/Form/FormMapper.php @@ -138,7 +138,7 @@ public function add($name, $type = null, array $options = [], array $fieldDescri if (isset($options['label_translation_parameters'])) { $fieldDescription->setOption('label_translation_parameters', $options['label_translation_parameters']); - unset($options['help']); + unset($options['label_translation_parameters']); } if (isset($options['help'])) { @@ -149,7 +149,7 @@ public function add($name, $type = null, array $options = [], array $fieldDescri if (isset($options['help_translation_parameters'])) { $fieldDescription->setOption('help_translation_parameters', $options['help_translation_parameters']); - unset($options['help']); + unset($options['help_translation_parameters']); } } diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig index fb1f4b5843..1678bf87a8 100644 --- a/src/Resources/views/Form/form_admin_fields.html.twig +++ b/src/Resources/views/Form/form_admin_fields.html.twig @@ -158,7 +158,7 @@ file that was distributed with this source code. {% elseif not sonata_admin.admin %} {{- label|trans(label_translation_parameters, translation_domain) -}} {% else %} - {{ label|trans(sonata_admin.field_description.labelTranslationParameters|default({}), sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} + {{ label|trans(sonata_admin.field_description.options.label_translation_parameters|default({}), sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} {% endif %} {% endif %} @@ -401,7 +401,7 @@ file that was distributed with this source code. {% endif %} {% if sonata_admin is defined and sonata_admin_enabled and sonata_admin.field_description.help|default(false) %} - {{ sonata_admin.field_description.help|trans(sonata_admin.field_description.helpTranslationParameters|default({}), sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} + {{ sonata_admin.field_description.help|trans(sonata_admin.field_description.options.help_translation_parameters|default({}), sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} {% endif %} {{ form_help(form) }} From 4269acc7a22f8d2af1dae5fbe61d60f5f986123c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ku=C5=9Bka?= Date: Fri, 17 Jul 2020 22:01:12 +0200 Subject: [PATCH 14/14] reterted changes to standard symfony approach and added label_translation_params for checkboxed and radios too (aswell as it works with standard Symfony forms) --- src/Form/FormMapper.php | 11 ----------- src/Resources/views/Form/form_admin_fields.html.twig | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/Form/FormMapper.php b/src/Form/FormMapper.php index 9bbecd0d36..49d3b32be8 100644 --- a/src/Form/FormMapper.php +++ b/src/Form/FormMapper.php @@ -136,21 +136,10 @@ public function add($name, $type = null, array $options = [], array $fieldDescri $options['label'] = $this->admin->getLabelTranslatorStrategy()->getLabel($name, 'form', 'label'); } - if (isset($options['label_translation_parameters'])) { - $fieldDescription->setOption('label_translation_parameters', $options['label_translation_parameters']); - unset($options['label_translation_parameters']); - } - if (isset($options['help'])) { $fieldDescription->setHelp($options['help']); unset($options['help']); } - - - if (isset($options['help_translation_parameters'])) { - $fieldDescription->setOption('help_translation_parameters', $options['help_translation_parameters']); - unset($options['help_translation_parameters']); - } } $this->admin->addFormFieldDescription($fieldName, $fieldDescription); diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig index 1678bf87a8..c09d6b0802 100644 --- a/src/Resources/views/Form/form_admin_fields.html.twig +++ b/src/Resources/views/Form/form_admin_fields.html.twig @@ -158,7 +158,7 @@ file that was distributed with this source code. {% elseif not sonata_admin.admin %} {{- label|trans(label_translation_parameters, translation_domain) -}} {% else %} - {{ label|trans(sonata_admin.field_description.options.label_translation_parameters|default({}), sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} + {{ label|trans(label_translation_parameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain) }} {% endif %} {% endif %} @@ -195,7 +195,7 @@ file that was distributed with this source code. {% if translation_domain is same as(false) %} {{- label -}} {% else %} - {{- label|trans({}, translation_domain) -}} + {{- label|trans(label_translation_parameters, translation_domain) -}} {%- endif -%} {%- endif -%} @@ -401,7 +401,7 @@ file that was distributed with this source code. {% endif %} {% if sonata_admin is defined and sonata_admin_enabled and sonata_admin.field_description.help|default(false) %} - {{ sonata_admin.field_description.help|trans(sonata_admin.field_description.options.help_translation_parameters|default({}), sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} + {{ sonata_admin.field_description.help|trans(help_translation_parameters, sonata_admin.field_description.translationDomain ?: admin.translationDomain)|raw }} {% endif %} {{ form_help(form) }}