diff --git a/src/Resources/views/themes/bootstrap_5.html.twig b/src/Resources/views/themes/bootstrap_5.html.twig index 66d2b0cf..16ab210a 100755 --- a/src/Resources/views/themes/bootstrap_5.html.twig +++ b/src/Resources/views/themes/bootstrap_5.html.twig @@ -204,19 +204,24 @@ 'data-placement': 'bottom', 'title': 'Clear all filters'|trans({}, 'KreyuDataTable'), 'data-turbo-action': 'advance', + 'data-turbo-frame': '_self', }|merge(attr|default({})) %} {{ block('filter_clear_all_button_icon') }} {% endblock %} {% block filter_clear_button %} - + {% set attr = { + 'class': 'btn px-2', + 'href': data_table_filter_clear_url(data_table, filter), + 'data-toggle': 'tooltip', + 'data-placement': 'bottom', + 'title': 'Clear filter'|trans({}, 'KreyuDataTable'), + 'data-turbo-action': 'advance', + 'data-turbo-frame': '_self', + }|merge(attr|default({})) %} + + {{ filter.vars.label|trans({}, filter.vars.translation_domain) }} @@ -225,7 +230,23 @@ {% endif %} - {{ filter.vars.value|trans({}, filter.vars.translation_domain) }} + + {% if filter.vars.value is iterable %} + {% for value in filter.vars.value %} + {%- if filter.vars.translation_domain is not same as false -%} + {{ value|trans({}, filter.vars.translation_domain) }} + {%- else -%} + {{ filter.vars.value }} + {%- endif -%} + {{- not loop.last ? ', ' }} + {% endfor %} + {% elseif filter.vars.translation_domain is not same as false %} + {{ filter.vars.value|trans({}, filter.vars.translation_domain) }} + {% else %} + {{ filter.vars.value }} + {% endif %} + + {% endblock %}