From dd83d1057d9149ac56de4b95c0740763e70ddc2f Mon Sep 17 00:00:00 2001
From: FredDut <FredDut@users.noreply.github.com>
Date: Thu, 21 Oct 2021 08:45:57 +0200
Subject: [PATCH] Update blocks.html.twig

invert column exists test in grid_column_filter_type_select and grid_column_filter_type_input
---
 Resources/views/blocks.html.twig | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/views/blocks.html.twig b/Resources/views/blocks.html.twig
index d1b8d50e..5dc4774d 100644
--- 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 %}