Merge pull request jmontoyaa#7 from FredDut/patch-6

Update blocks.html.twig
link911 · Oct 21, 2021 · a0c31b2 · a0c31b2
2 parents 2e31115 + dd83d10
commit a0c31b2
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Resources/views/blocks.html.twig b/Resources/views/blocks.html.twig
@@ -329,13 +329,13 @@
 {% set isNullOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_ISNULL') %}
 {% set isNotNullOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_ISNOTNULL') %}
 {% if column %}
-  {% set op = column.defaultOperator %}
-  {% set from = null %}
-  {% set to = null %}
-{% else %}
   {% set op = column.data.operator is defined ? column.data.operator : column.defaultOperator %}
   {% set from = column.data.from is defined ? column.data.from : null %}
   {% set to = column.data.to is defined ? column.data.to : null %}
+{% else %}
+  {% set op = column.defaultOperator %}
+  {% set from = null %}
+  {% set to = null %}
 {% endif %}
 <span class="grid-filter-input">
     {{ grid_column_operator(column, grid, op, submitOnChange) }}
@@ -352,13 +352,13 @@
 {% set isNullOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_ISNULL') %}
 {% set isNotNullOperator = constant('APY\\DataGridBundle\\Grid\\Column\\Column::OPERATOR_ISNOTNULL') %}
 {% if column %}
-  {% set op = column.defaultOperator %}
-  {% set from = null %}
-  {% set to = null %}
-{% else %}
   {% set op = column.data.operator is defined ? column.data.operator : column.defaultOperator %}
   {% set from = column.data.from is defined ? column.data.from : null %}
   {% set to = column.data.to is defined ? column.data.to : null %}
+{% else %}
+  {% set op = column.defaultOperator %}
+  {% set from = null %}
+  {% set to = null %}
 {% endif %}
 {% set multiple = column.selectMulti %}
 {% set expanded = column.selectExpanded %}