Skip to content

Commit

Permalink
fix: InputBag::get method return only scalar type, not array
Browse files Browse the repository at this point in the history
  • Loading branch information
delyriand committed Jun 23, 2023
1 parent 2a9cb18 commit 44239e5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/Resources/views/Search/_filters.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% endfor %}

{# Don't loose current sorting #}
{% set sorting = app.request.query.get('sorting') %}
{% set sorting = app.request.query.all()['sorting']|default() %}
{% if sorting is not empty %}
{% for sort, order in sorting %}
<input type="hidden" name="sorting[{{ sort }}]" value="{{ order }}" />
Expand Down
17 changes: 9 additions & 8 deletions src/Resources/views/Search/_sorting.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% set route = app.request.attributes.get('_route') %}
{% set route_parameters = app.request.attributes.get('_route_params')|merge(app.request.query.all) %}

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

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

{% if app.request.query.get('sorting') is empty %}
{% set sorting = app.request.query.all()['sorting']|default() %}
{% if sorting is empty %}
{% set current_sorting_label = 'sylius.ui.by_position'|trans|lower %}
{% elseif app.request.query.get('sorting').name is defined and app.request.query.get('sorting').name == 'asc'%}
{% elseif sorting.name is defined and sorting.name == 'asc'%}
{% set current_sorting_label = 'sylius.ui.from_a_to_z'|trans|lower %}
{% elseif app.request.query.get('sorting').name is defined and app.request.query.get('sorting').name == 'desc'%}
{% elseif sorting.name is defined and sorting.name == 'desc'%}
{% set current_sorting_label = 'sylius.ui.from_z_to_a'|trans|lower %}
{% elseif app.request.query.get('sorting').created_at is defined and app.request.query.get('sorting').created_at == 'desc'%}
{% elseif sorting.created_at is defined and sorting.created_at == 'desc'%}
{% set current_sorting_label = 'sylius.ui.newest_first'|trans|lower %}
{% elseif app.request.query.get('sorting').created_at is defined and app.request.query.get('sorting').created_at == 'asc'%}
{% elseif sorting.created_at is defined and sorting.created_at == 'asc'%}
{% set current_sorting_label = 'sylius.ui.oldest_first'|trans|lower %}
{% elseif app.request.query.get('sorting').price is defined and app.request.query.get('sorting').price == 'asc'%}
{% elseif sorting.price is defined and sorting.price == 'asc'%}
{% set current_sorting_label = 'sylius.ui.cheapest_first'|trans|lower %}
{% elseif app.request.query.get('sorting').price is defined and app.request.query.get('sorting').price == 'desc' %}
{% elseif sorting.price is defined and sorting.price == 'desc' %}
{% set current_sorting_label = 'sylius.ui.most_expensive_first'|trans|lower %}
{% else %}
{% set current_sorting_label = 'sylius.ui.by_position'|trans|lower %}
Expand Down

0 comments on commit 44239e5

Please sign in to comment.