Skip to content

Commit 96533f2

Browse files
Fix Admin job list filter display (#179)
1 parent 4313523 commit 96533f2

File tree

1 file changed

+26
-20
lines changed

1 file changed

+26
-20
lines changed

src/batch-symfony-framework/src/Resources/views/sonata/list.html.twig

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -148,21 +148,21 @@
148148
{% endblock %}
149149

150150
{% block list_filters_actions %}
151-
<ul class="nav navbar-nav navbar-right">
151+
<ul class="nav navbar-nav navbar-right" id="filter-list-job-execution" {{ stimulus_controller('sonata-filter-list', {}, { 'active': 'active' }, { 'sonata-filter': '#filter-container-job-execution' }) }}>
152152
<li class="dropdown sonata-actions">
153153
<a href="#" class="dropdown-toggle sonata-ba-action" data-toggle="dropdown">
154-
<i class="fa fa-filter" aria-hidden="true"></i>
154+
<i class="fas fa-filter" aria-hidden="true"></i>
155155
{{ 'link_filters'|trans({}, 'SonataAdminBundle') }}
156-
<span class="badge sonata-filter-count"></span>
156+
<span class="badge" {{ stimulus_target('sonata-filter-list', 'counter') }}></span>
157157
<b class="caret"></b>
158158
</a>
159-
<ul class="dropdown-menu" role="menu">
159+
160+
<ul class="dropdown-menu dropdown-menu-scrollable" role="menu">
160161
{% for filter in form %}
161-
<li>
162-
<a href="#" class="sonata-toggle-filter sonata-ba-action"
163-
filter-target="filter-job-{{ filter.vars.name }}"
164-
filter-container="filter-container-job">
165-
<i class="fa {{ (filter.vars.name in filters) ? 'fa-check-square-o' : 'fa-square-o' }}"></i>
162+
{% set filterDisplayed = filter.vars.name in filters %}
163+
<li class="sonata-filter-option">
164+
<a href="#" class="sonata-toggle-filter sonata-ba-action{% if filterDisplayed %} active{% endif %}" data-filter="filter-job-execution-{{ filter.vars.name }}" {{ stimulus_target('sonata-filter-list', 'field') }} {{ stimulus_action('sonata-filter-list', 'toggle:prevent:stop', 'click') }}>
165+
<i class="far"></i>
166166
{{ (filter.vars.label)|trans({}, filter.vars.translation_domain) }}
167167
</a>
168168
</li>
@@ -174,27 +174,34 @@
174174

175175
{% block list_filters %}
176176
{% form_theme form filter_template %}
177-
<div class="col-xs-12 col-md-12 sonata-filters-box" style="display: {{ (filters|length > 0) ? 'block' : 'none' }}" id="filter-container-job">
177+
<div class="col-xs-12 col-md-12 sonata-filters-box"
178+
id="filter-container-job-execution" {{ stimulus_controller('sonata-filter', {}, {}, { 'sonata-filter-list': '#filter-list-job-execution' }) }} {% if not filters|length %}hidden{% endif %}>
178179
<div class="box box-primary" >
179180
<div class="box-body">
180-
<form class="sonata-filter-form form-horizontal" action="{{ path('yokai_batch.job_list') }}" method="GET" role="form">
181+
<form
182+
class="sonata-filter-form form-horizontal"
183+
action="{{ path('yokai_batch.job_list') }}"
184+
method="GET"
185+
role="form"
186+
{{ stimulus_target('sonata-filter', 'form') }}
187+
{{ stimulus_action('sonata-filter', 'prepareSubmit', 'submit') }}>
181188
{{ form_errors(form) }}
189+
182190
<div class="row">
183191
<div class="col-sm-9">
184192
{% for filter in form %}
185-
{% set filterVisible = true %}
186-
{% set filterActive = filter.vars.name in filters %}
187-
<div class="form-group" id="filter-job-{{ filter.vars.name }}" sonata-filter="{{ filterVisible ? 'true' : 'false' }}" style="display: {% if filterActive %}block{% else %}none{% endif %}">
193+
{% set filterDisplayed = filter.vars.name in filters %}
194+
<div class="form-group" id="filter-job-execution-{{ filter.vars.name }}" {{ stimulus_target('sonata-filter', 'group') }} {% if not filterDisplayed %}hidden{% endif %}>
188195
<label for="{{ filter.vars.id }}" class="col-sm-3 control-label">{{ filter.vars.label|trans({}, filter.vars.translation_domain) }}</label>
189-
<div class="col-sm-4 advanced-filter">
196+
<div class="col-sm-4 advanced-filter" hidden>
190197
</div>
191198
<div class="col-sm-4">
192199
{{ form_widget(filter) }}
193200
</div>
194201
<div class="col-sm-1">
195202
<label class="control-label">
196-
<a href="#" class="sonata-toggle-filter sonata-ba-action" filter-target="filter-job-{{ filter.vars.name }}" filter-container="filter-container-job">
197-
<i class="fa fa-minus-circle" aria-hidden="true"></i>
203+
<a href="#" class="sonata-ba-action" {{ stimulus_action('sonata-filter', 'hideFilter', 'click', { 'id': 'filter-job-execution-' ~ filter.vars.name }) }}>
204+
<i class="fas fa-minus-circle" aria-hidden="true"></i>
198205
</a>
199206
</label>
200207
</div>
@@ -205,9 +212,8 @@
205212
{{ form_rest(form) }}
206213

207214
<div class="form-group">
208-
<button type="submit" class="btn btn-primary">
209-
<i class="fa fa-filter" aria-hidden="true"></i>
210-
{{ 'btn_filter'|trans({}, 'SonataAdminBundle') }}
215+
<button type="submit" class="btn btn-primary" {{ stimulus_target('sonata-filter', 'submitter') }}>
216+
<i class="fas fa-filter" aria-hidden="true"></i> {{ 'btn_filter'|trans({}, 'SonataAdminBundle') }}
211217
</button>
212218

213219
<a class="btn btn-default" href="{{ path('yokai_batch.job_list') }}">

0 commit comments

Comments
 (0)