Skip to content

Commit 25dbb56

Browse files
committed
Add data-turbo-frame="_self" to filter clear buttons, fix iterable filter value throwing exception on render
1 parent 9d0b524 commit 25dbb56

File tree

1 file changed

+29
-8
lines changed

1 file changed

+29
-8
lines changed

src/Resources/views/themes/bootstrap_5.html.twig

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,24 @@
204204
'data-placement': 'bottom',
205205
'title': 'Clear all filters'|trans({}, 'KreyuDataTable'),
206206
'data-turbo-action': 'advance',
207+
'data-turbo-frame': '_self',
207208
}|merge(attr|default({})) %}
208209

209210
<a {{ block('attributes') }}>{{ block('filter_clear_all_button_icon') }}</a>
210211
{% endblock %}
211212

212213
{% block filter_clear_button %}
213-
<a class="btn px-2"
214-
href="{{ data_table_filter_clear_url(data_table, filter) }}"
215-
data-turbo-action="advance"
216-
data-toggle="tooltip"
217-
data-placement="bottom"
218-
title="{{ 'Clear filter'|trans({}, 'KreyuDataTable') }}"
219-
>
214+
{% set attr = {
215+
'class': 'btn px-2',
216+
'href': data_table_filter_clear_url(data_table, filter),
217+
'data-toggle': 'tooltip',
218+
'data-placement': 'bottom',
219+
'title': 'Clear filter'|trans({}, 'KreyuDataTable'),
220+
'data-turbo-action': 'advance',
221+
'data-turbo-frame': '_self',
222+
}|merge(attr|default({})) %}
223+
224+
<a {{ block('attributes') }}>
220225
<span class="mx-1">
221226
<strong>{{ filter.vars.label|trans({}, filter.vars.translation_domain) }}</strong>
222227

@@ -225,7 +230,23 @@
225230
{% endif %}
226231
</span>
227232

228-
<span class="">{{ filter.vars.value|trans({}, filter.vars.translation_domain) }}</span>
233+
<span>
234+
{% if filter.vars.value is iterable %}
235+
{% for value in filter.vars.value %}
236+
{%- if filter.vars.translation_domain is not same as false -%}
237+
{{ value|trans({}, filter.vars.translation_domain) }}
238+
{%- else -%}
239+
{{ filter.vars.value }}
240+
{%- endif -%}
241+
{{- not loop.last ? ', ' }}
242+
{% endfor %}
243+
{% elseif filter.vars.translation_domain is not same as false %}
244+
{{ filter.vars.value|trans({}, filter.vars.translation_domain) }}
245+
{% else %}
246+
{{ filter.vars.value }}
247+
{% endif %}
248+
</span>
249+
229250
<span class="mx-2" aria-hidden="true">{{ block('filter_clear_button_icon') }}</span>
230251
</a>
231252
{% endblock %}

0 commit comments

Comments
 (0)