Skip to content

Commit 9a905cd

Browse files
committed
fix: InputBag::get method return only scalar type, not array
1 parent 9f9d45c commit 9a905cd

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/Resources/views/Search/_filters.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{% endfor %}
1717

1818
{# Don't loose current sorting #}
19-
{% set sorting = app.request.query.get('sorting') %}
19+
{% set sorting = app.request.query.all()['sorting']|default() %}
2020
{% if sorting is not empty %}
2121
{% for sort, order in sorting %}
2222
<input type="hidden" name="sorting[{{ sort }}]" value="{{ order }}" />

src/Resources/views/Search/_sorting.html.twig

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% set route = app.request.attributes.get('_route') %}
33
{% set route_parameters = app.request.attributes.get('_route_params')|merge(app.request.query.all) %}
44

5-
{% set criteria = app.request.query.get('criteria', {}) %}
5+
{% set criteria = app.request.query.all()['criteria']|default({}) %}
66

77
{% set default_path = path(route, route_parameters|merge({'sorting': null, 'criteria': criteria})) %}
88
{% set from_a_to_z_path = path(route, route_parameters|merge({'sorting': {'name': 'asc'}, 'criteria': criteria})) %}
@@ -12,19 +12,20 @@
1212
{% set cheapest_first_path = path(route, route_parameters|merge({'sorting': {'price': 'asc'}, 'criteria': criteria})) %}
1313
{% set most_expensive_first_path = path(route, route_parameters|merge({'sorting': {'price': 'desc'}, 'criteria': criteria})) %}
1414

15-
{% if app.request.query.get('sorting') is empty %}
15+
{% set sorting = app.request.query.all()['sorting']|default() %}
16+
{% if sorting is empty %}
1617
{% set current_sorting_label = 'sylius.ui.by_position'|trans|lower %}
17-
{% elseif app.request.query.get('sorting').name is defined and app.request.query.get('sorting').name == 'asc'%}
18+
{% elseif sorting.name is defined and sorting.name == 'asc'%}
1819
{% set current_sorting_label = 'sylius.ui.from_a_to_z'|trans|lower %}
19-
{% elseif app.request.query.get('sorting').name is defined and app.request.query.get('sorting').name == 'desc'%}
20+
{% elseif sorting.name is defined and sorting.name == 'desc'%}
2021
{% set current_sorting_label = 'sylius.ui.from_z_to_a'|trans|lower %}
21-
{% elseif app.request.query.get('sorting').created_at is defined and app.request.query.get('sorting').created_at == 'desc'%}
22+
{% elseif sorting.created_at is defined and sorting.created_at == 'desc'%}
2223
{% set current_sorting_label = 'sylius.ui.newest_first'|trans|lower %}
23-
{% elseif app.request.query.get('sorting').created_at is defined and app.request.query.get('sorting').created_at == 'asc'%}
24+
{% elseif sorting.created_at is defined and sorting.created_at == 'asc'%}
2425
{% set current_sorting_label = 'sylius.ui.oldest_first'|trans|lower %}
25-
{% elseif app.request.query.get('sorting').price is defined and app.request.query.get('sorting').price == 'asc'%}
26+
{% elseif sorting.price is defined and sorting.price == 'asc'%}
2627
{% set current_sorting_label = 'sylius.ui.cheapest_first'|trans|lower %}
27-
{% elseif app.request.query.get('sorting').price is defined and app.request.query.get('sorting').price == 'desc' %}
28+
{% elseif sorting.price is defined and sorting.price == 'desc' %}
2829
{% set current_sorting_label = 'sylius.ui.most_expensive_first'|trans|lower %}
2930
{% else %}
3031
{% set current_sorting_label = 'sylius.ui.by_position'|trans|lower %}

0 commit comments

Comments
 (0)