From b87f8b9c8409df752a4c4870e532f6d55b751e8c Mon Sep 17 00:00:00 2001
From: Shreesh Arora <shreesh.arora608@webkul.in>
Date: Fri, 24 May 2024 16:18:19 +0530
Subject: [PATCH] Fixed: filter input field are saved before validation

---
 .../template/helpers/list/list_header.tpl     |  28 ++-
 classes/controller/AdminController.php        | 210 ++++++++++--------
 2 files changed, 139 insertions(+), 99 deletions(-)

diff --git a/admin/themes/default/template/helpers/list/list_header.tpl b/admin/themes/default/template/helpers/list/list_header.tpl
index bf7678e4f..70b0c572b 100644
--- a/admin/themes/default/template/helpers/list/list_header.tpl
+++ b/admin/themes/default/template/helpers/list/list_header.tpl
@@ -291,28 +291,30 @@
 													<label class="col-xs-3" for="filter_input_{$key}">{$params['title']|escape:'html':'UTF-8'}</label>
 													<div class="col-xs-9">
 														{if $params.type == 'range'}
+															{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
 															<div class="input_range">
-																<input type="text" class="filter form-control" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}[0]" placeholder="{l s='From'}" value="{if isset($params.value.0)}{$params.value.0}{/if}">
-																<input type="text" class="filter form-control" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}[1]" placeholder="{l s='To'}" value="{if isset($params.value.1)}{$params.value.1}{/if}">
+																<input type="text" class="filter form-control" name="{$field_name}[0]" placeholder="{l s='From'}" value="{if isset($smarty.post[$field_name][0]) && $smarty.post[$field_name][0]}{$smarty.post[$field_name][0]}{elseif isset($params.value.0)}{$params.value.0}{/if}">
+																<input type="text" class="filter form-control" name="{$field_name}[1]" placeholder="{l s='To'}" value="{if isset($smarty.post[$field_name][1]) && $smarty.post[$field_name][1]}{$smarty.post[$field_name][1]}{elseif isset($params.value.1)}{$params.value.1}{/if}">
 															</div>
 														{elseif $params.type == 'bool'}
-															<select id="filter_input_{$key}" class="filter center" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}">
+															{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
+															<select id="filter_input_{$key}" class="filter center" name="{$field_name}">
 																<option value="">-</option>
-																<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
-																<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
+																<option value="1" {if isset($smarty.post.$field_name) && $smarty.post.$field_name == 1} selected="selected"{elseif $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
+																<option value="0" {if isset($smarty.post.$field_name) && $smarty.post.$field_name == 0} selected="selected"{elseif $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
 															</select>
 														{elseif $params.type == 'date' || $params.type == 'datetime'}
 															<div class="date_range">
 																<div class="input-group center">
 																	<input type="text" class="filter datepicker date-input form-control" id="local_{$params.id_date}_0" name="local_{$params.name_date}[0]"  placeholder="{l s='From'}" autocomplete="off"/>
-																	<input type="hidden" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}">
+																	<input type="hidden" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($smarty.post[$params.name_date][0]) && $smarty.post[$params.name_date][0]}{$smarty.post[$params.name_date][0]}{elseif isset($params.value.0)}{$params.value.0}{/if}">
 																	<span class="input-group-addon">
 																		<i class="icon-calendar"></i>
 																	</span>
 																</div>
 																<div class="input-group center">
 																	<input type="text" class="filter datepicker date-input form-control" id="local_{$params.id_date}_1" name="local_{$params.name_date}[1]"  placeholder="{l s='To'}"  autocomplete="off"/>
-																	<input type="hidden" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}">
+																	<input type="hidden" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($smarty.post[$params.name_date][1]) && $smarty.post[$params.name_date][1]}{$smarty.post[$params.name_date][1]}{elseif isset($params.value.1)}{$params.value.1}{/if}">
 																	<span class="input-group-addon">
 																		<i class="icon-calendar"></i>
 																	</span>
@@ -366,28 +368,30 @@
 																</script>
 															</div>
 														{elseif $params.type == 'select'}
+															{$field_name="`$list_id`Filter_`$params.filter_key`"}
 															{if isset($params.multiple) && $params.multiple}
-																<select id="filter_input_{$key}" class="filter{if isset($params.align) && $params.align == 'center'}center{/if} select_multiple_{$params.operator} chosen" multiple name="{$list_id}Filter_{$params.filter_key}[]" {if isset($params.width)} style="width:{$params.width}px"{/if}>
+																<select id="filter_input_{$key}" class="filter{if isset($params.align) && $params.align == 'center'}center{/if} select_multiple_{$params.operator} chosen" multiple name="{$field_name}[]" {if isset($params.width)} style="width:{$params.width}px"{/if}>
 																	{if isset($params.list) && is_array($params.list)}
 																		{foreach $params.list AS $option_value => $option_display}
-																			<option value="{$option_value}" {if isset($params.value) && $params.value}{if in_array($option_value, $params.value)} selected="selected"{/if}{/if}>{$option_display}</option>
+																			<option value="{$option_value}" {if isset($smarty.post.$field_name) && $smarty.post.$field_name && in_array($option_value, $smarty.post.$field_name)} selected="selected"{elseif isset($params.value) && $params.value}{if in_array($option_value, $params.value)} selected="selected"{/if}{/if}>{$option_display}</option>
 																		{/foreach}
 																	{/if}
 																</select>
 															{else}
 																{if isset($params.filter_key)}
-																	<select id="filter_input_{$key}" class="filter{if isset($params.align) && $params.align == 'center'}center{/if} {if isset($params.class)}{$params.class}{/if}" name="{$list_id}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
+																	<select id="filter_input_{$key}" class="filter{if isset($params.align) && $params.align == 'center'}center{/if} {if isset($params.class)}{$params.class}{/if}" name="{$field_name}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
 																		<option value="" {if $params.value == ''} selected="selected" {/if}>-</option>
 																		{if isset($params.list) && is_array($params.list)}
 																			{foreach $params.list AS $option_value => $option_display}
-																				<option value="{$option_value}" {if (string)$option_display === (string)$params.value ||  (string)$option_value === (string)$params.value} selected="selected"{/if}>{$option_display}</option>
+																				<option value="{$option_value}" {if isset($smarty.post.$field_name) && $smarty.post.$field_name == $option_value} selected="selected"{elseif (string)$option_display === (string)$params.value ||  (string)$option_value === (string)$params.value} selected="selected"{/if}>{$option_display}</option>
 																			{/foreach}
 																		{/if}
 																	</select>
 																{/if}
 															{/if}
 														{else}
-															<input type="text" id="filter_input_{$key}" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'html':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
+															{$field_name="`$list_id`Filter_{if isset($params.filter_key)}`$params.filter_key`{else}`$key`{/if}"}
+															<input type="text" id="filter_input_{$key}" class="filter" name="{$field_name}" value="{if isset($smarty.post.$field_name) && $smarty.post.$field_name}{$smarty.post.$field_name}{else}{$params.value|escape:'html':'UTF-8'}{/if}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
 														{/if}
 													</div>
 												</div>
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 6d36f953e..787b527c3 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -841,13 +841,13 @@ class AdminControllerCore extends Controller
         $this->ensureListIdDefinition();
 
         $prefix = $this->getCookieFilterPrefix();
-
+        $filters = array();
         if (isset($this->list_id)) {
             foreach ($_POST as $key => $value) {
                 if ($value === '') {
                     unset($this->context->cookie->{$prefix.$key});
                 } elseif (stripos($key, $this->list_id.'Filter_') === 0) {
-                    $this->context->cookie->{$prefix.$key} = !is_array($value) ? $value : json_encode($value);
+                    $filters[$prefix.$key] = !is_array($value) ? $value : json_encode($value);
                 } elseif (stripos($key, 'submitFilter') === 0) {
                     $this->context->cookie->$key = !is_array($value) ? $value : json_encode($value);
                 }
@@ -855,7 +855,7 @@ class AdminControllerCore extends Controller
 
             foreach ($_GET as $key => $value) {
                 if (stripos($key, $this->list_id.'Filter_') === 0) {
-                    $this->context->cookie->{$prefix.$key} = !is_array($value) ? $value : json_encode($value);
+                    $filters[$prefix.$key] = !is_array($value) ? $value : json_encode($value);
                 } elseif (stripos($key, 'submitFilter') === 0) {
                     $this->context->cookie->$key = !is_array($value) ? $value : json_encode($value);
                 }
@@ -863,65 +863,36 @@ class AdminControllerCore extends Controller
                     if ($value === '' || $value == $this->_defaultOrderBy) {
                         unset($this->context->cookie->{$prefix.$key});
                     } else {
-                        $this->context->cookie->{$prefix.$key} = $value;
+                        $filters[$prefix.$key] = $value;
                     }
                 } elseif (stripos($key, $this->list_id.'Orderway') === 0 && Validate::isOrderWay($value)) {
                     if ($value === '' || $value == $this->_defaultOrderWay) {
                         unset($this->context->cookie->{$prefix.$key});
                     } else {
-                        $this->context->cookie->{$prefix.$key} = $value;
+                        $filters[$prefix.$key] = $value;
                     }
                 }
             }
         }
 
-        $filters = $this->context->cookie->getFamily($prefix.$this->list_id.'Filter_');
-        $definition = false;
-        if (isset($this->className) && $this->className) {
-            $definition = ObjectModel::getDefinition($this->className);
+        if (empty($filters)) {
+            $filters = $this->context->cookie->getFamily($prefix.$this->list_id.'Filter_');
         }
 
         foreach ($filters as $key => $value) {
-            /* Extracting filters from $_POST on key filter_ */
-            if ($value != null && !strncmp($key, $prefix.$this->list_id.'Filter_', 7 + Tools::strlen($prefix.$this->list_id))) {
-                $key_org = $key;
-                $key = Tools::substr($key, 7 + Tools::strlen($prefix.$this->list_id));
-                /* Table alias could be specified using a ! eg. alias!field */
-                $tmp_tab = explode('!', $key);
-                $filter = count($tmp_tab) > 1 ? $tmp_tab[1] : $tmp_tab[0];
-
-                if ($field = $this->filterToField($key, $filter)) {
-                    $type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false));
-                    if ((($type == 'date' || $type == 'datetime' || $type == 'range') || ($type == 'select' && (isset($field['multiple']) && $field['multiple'])))
-                        && is_string($value)
-                    ) {
-                        $value = json_decode($value, true);
+            $key_org = $key;
+            $key = Tools::substr($key, 7 + Tools::strlen($prefix.$this->list_id));
+            /* Table alias could be specified using a ! eg. alias!field */
+            $tmp_tab = explode('!', $key);
+            $filter = count($tmp_tab) > 1 ? $tmp_tab[1] : $tmp_tab[0];
+            if ($field = $this->filterToField($key, $filter)) {
+                $type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false));
+                if (($type == 'date' || $type == 'datetime' || $type == 'range')) {
+                    if (is_string($value)) {
+                        $filter_value = json_decode($value, true);
                     }
-                    $key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`';
-
-                    // as in database 0 means position 1 in the renderlist
-                    if (isset($field['position']) && Validate::isInt($value)) {
-                        $value -= 1;
-                    }
-
-                    // Assignment by reference
-                    if (array_key_exists('tmpTableFilter', $field)) {
-                        $sql_filter = & $this->_tmpTableFilter;
-                    } elseif (array_key_exists('havingFilter', $field)) {
-                        $sql_filter = & $this->_filterHaving;
-                    } else {
-                        $sql_filter = & $this->_filter;
-                    }
-
-                    if (is_array($value)) {
-                        if ($type == 'select' && (isset($field['multiple']) && $field['multiple']) && isset($field['operator'])) {
-                            if ($field['operator'] == 'and') {
-                                $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')';
-                                $this->_filterHaving .= ' AND COUNT(DISTINCT '.pSQL($key).') = '.(int) count($value);
-                            } elseif ($field['operator'] == 'or') {
-                                $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')';
-                            }
-                        } elseif ($type == 'range') {
+                    if (is_array($filter_value)) {
+                        if ($type == 'range') {
                             // set validation type
                             if (isset($field['validation']) && $field['validation'] && method_exists('Validate', $field['validation'])) {
                                 $validation = $field['validation'];
@@ -929,57 +900,122 @@ class AdminControllerCore extends Controller
                                 $validation = 'isUnsignedInt';
                             }
 
-                            if (isset($value[0]) && ($value[0] !== '' || $value[0] === 0)) {
-                                if (!Validate::$validation($value[0])) {
-                                    $this->errors[] = Tools::displayError('The \'From\' value is invalid');
-                                } else {
-                                    $sql_filter .= ' AND '.pSQL($key).' >= '.pSQL($value[0]);
+                            if (isset($filter_value[0]) && ($filter_value[0] !== '' || $filter_value[0] === 0)) {
+                                if (!Validate::$validation($filter_value[0])) {
+                                    $this->errors[] = sprintf(Tools::displayError('The %s field \'From\' value is invalid'), $field['title']);
                                 }
                             }
-                            if (isset($value[1]) && ($value[1] !== '' || $value[1] === 0)) {
-                                if (!Validate::$validation($value[1])) {
-                                    $this->errors[] = Tools::displayError('The \'To\' value is invalid');
-                                } elseif ((isset($value[0]) && ($value[0] !== '' || $value[0] === 0)) && $value[0] > $value[1]) {
-                                    $this->errors[] = Tools::displayError('The \'To\' value cannot be less than \'From\' value');
-                                } else {
-                                    $sql_filter .= ' AND '.pSQL($key).' <= '.pSQL($value[1]);
+                            if (isset($filter_value[1]) && ($filter_value[1] !== '' || $filter_value[1] === 0)) {
+                                if (!Validate::$validation($filter_value[1])) {
+                                    $this->errors[] = sprintf(Tools::displayError('The %s field \'To\' value is invalid'), $field['title']);
+                                } elseif ((isset($filter_value[0]) && ($filter_value[0] !== '' || $filter_value[0] === 0)) && $filter_value[0] > $filter_value[1]) {
+                                    $this->errors[] = sprintf(Tools::displayError('The %s field \'To\' value cannot be less than \'From\' value'), $field['title']);
                                 }
                             }
                         } else {
-                            if (isset($value[0]) && !empty($value[0])) {
-                                if (!Validate::isDate($value[0])) {
-                                    $this->errors[] = Tools::displayError('The \'From\' date format is invalid (YYYY-MM-DD)');
-                                } else {
-                                    $sql_filter .= ' AND '.pSQL($key).' >= \''.pSQL(Tools::dateFrom($value[0])).'\'';
+                            if (isset($filter_value[0]) && !empty($filter_value[0])) {
+                                if (!Validate::isDate($filter_value[0])) {
+                                    $this->errors[] = sprintf(Tools::displayError('The %s field \'From\' date format is invalid (YYYY-MM-DD)'), $field['title']);
                                 }
                             }
 
-                            if (isset($value[1]) && !empty($value[1])) {
-                                if (!Validate::isDate($value[1])) {
-                                    $this->errors[] = Tools::displayError('The \'To\' date format is invalid (YYYY-MM-DD)');
-                                } elseif (isset($value[0]) && !empty($value[0]) && strtotime($value[0]) > strtotime($value[1])) {
-                                    $this->errors[] = Tools::displayError('The \'To\' date cannot be earlier than \'From\' date');
-                                } else {
-                                    $sql_filter .= ' AND '.pSQL($key).' <= \''.pSQL(Tools::dateTo($value[1])).'\'';
+                            if (isset($filter_value[1]) && !empty($filter_value[1])) {
+                                if (!Validate::isDate($filter_value[1])) {
+                                    $this->errors[] = sprintf(Tools::displayError('The %s field \'To\' date format is invalid (YYYY-MM-DD)'), $field['title']);
+                                } elseif (isset($filter_value[0]) && !empty($filter_value[0]) && strtotime($filter_value[0]) > strtotime($filter_value[1])) {
+                                    $this->errors[] = sprintf(Tools::displayError('The %s field \'To\' date cannot be earlier than \'From\' date'), $field['title']);
                                 }
                             }
                         }
-                    } else {
-                        $sql_filter .= ' AND ';
-                        $check_key = ($key == $this->identifier || $key == '`'.$this->identifier.'`');
-                        $alias = ($definition && !empty($definition['fields'][$filter]['shop'])) ? 'sa' : 'a';
+                    }
+                }
+            }
+        }
 
-                        if ($type == 'int' || $type == 'bool') {
-                            $sql_filter .= (($check_key || $key == '`active`') ?  $alias.'.' : '').pSQL($key).' = '.(int)$value.' ';
-                        } elseif ($type == 'decimal') {
-                            $sql_filter .= ($check_key ?  $alias.'.' : '').pSQL($key).' = '.(float)$value.' ';
-                        } elseif ($type == 'select') {
-                            $sql_filter .= ($check_key ?  $alias.'.' : '').pSQL($key).' = \''.pSQL($value).'\' ';
-                        } elseif ($type == 'price') {
-                            $value = (float)str_replace(',', '.', $value);
-                            $sql_filter .= ($check_key ?  $alias.'.' : '').pSQL($key).' = '.pSQL(trim($value)).' ';
+        if (empty($this->errors)) {
+            if ($filters) {
+                foreach ($filters as $key => $value) {
+                    $this->context->cookie->$key = $value;
+                }
+            }
+            $definition = false;
+            if (isset($this->className) && $this->className) {
+                $definition = ObjectModel::getDefinition($this->className);
+            }
+
+            foreach ($filters as $key => $value) {
+                /* Extracting filters from $_POST on key filter_ */
+                if ($value != null && !strncmp($key, $prefix.$this->list_id.'Filter_', 7 + Tools::strlen($prefix.$this->list_id))) {
+                    $key_org = $key;
+                    $key = Tools::substr($key, 7 + Tools::strlen($prefix.$this->list_id));
+                    /* Table alias could be specified using a ! eg. alias!field */
+                    $tmp_tab = explode('!', $key);
+                    $filter = count($tmp_tab) > 1 ? $tmp_tab[1] : $tmp_tab[0];
+
+                    if ($field = $this->filterToField($key, $filter)) {
+                        $type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false));
+                        if ((($type == 'date' || $type == 'datetime' || $type == 'range') || ($type == 'select' && (isset($field['multiple']) && $field['multiple'])))
+                            && is_string($value)
+                        ) {
+                            $value = json_decode($value, true);
+                        }
+                        $key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`';
+
+                        // as in database 0 means position 1 in the renderlist
+                        if (isset($field['position']) && Validate::isInt($value)) {
+                            $value -= 1;
+                        }
+
+                        // Assignment by reference
+                        if (array_key_exists('tmpTableFilter', $field)) {
+                            $sql_filter = & $this->_tmpTableFilter;
+                        } elseif (array_key_exists('havingFilter', $field)) {
+                            $sql_filter = & $this->_filterHaving;
                         } else {
-                            $sql_filter .= ($check_key ?  $alias.'.' : '').pSQL($key).' LIKE \'%'.pSQL(trim($value)).'%\' ';
+                            $sql_filter = & $this->_filter;
+                        }
+
+                        if (is_array($value)) {
+                            if ($type == 'select' && (isset($field['multiple']) && $field['multiple']) && isset($field['operator'])) {
+                                if ($field['operator'] == 'and') {
+                                    $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')';
+                                    $this->_filterHaving .= ' AND COUNT(DISTINCT '.pSQL($key).') = '.(int) count($value);
+                                } elseif ($field['operator'] == 'or') {
+                                    $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')';
+                                }
+                            } elseif ($type == 'range') {
+
+                                if (isset($value[0]) && ($value[0] !== '' || $value[0] === 0)) {
+                                    $sql_filter .= ' AND '.pSQL($key).' >= '.pSQL($value[0]);
+                                }
+                                if (isset($value[1]) && ($value[1] !== '' || $value[1] === 0)) {
+                                    $sql_filter .= ' AND '.pSQL($key).' <= '.pSQL($value[1]);
+                                }
+                            } else {
+                                if (isset($value[0]) && !empty($value[0])) {
+                                    $sql_filter .= ' AND '.pSQL($key).' >= \''.pSQL(Tools::dateFrom($value[0])).'\'';
+                                }
+                                if (isset($value[1]) && !empty($value[1])) {
+                                    $sql_filter .= ' AND '.pSQL($key).' <= \''.pSQL(Tools::dateTo($value[1])).'\'';
+                                }
+                            }
+                        } else {
+                            $sql_filter .= ' AND ';
+                            $check_key = ($key == $this->identifier || $key == '`'.$this->identifier.'`');
+                            $alias = ($definition && !empty($definition['fields'][$filter]['shop'])) ? 'sa' : 'a';
+
+                            if ($type == 'int' || $type == 'bool') {
+                                $sql_filter .= (($check_key || $key == '`active`') ?  $alias.'.' : '').pSQL($key).' = '.(int)$value.' ';
+                            } elseif ($type == 'decimal') {
+                                $sql_filter .= ($check_key ?  $alias.'.' : '').pSQL($key).' = '.(float)$value.' ';
+                            } elseif ($type == 'select') {
+                                $sql_filter .= ($check_key ?  $alias.'.' : '').pSQL($key).' = \''.pSQL($value).'\' ';
+                            } elseif ($type == 'price') {
+                                $value = (float)str_replace(',', '.', $value);
+                                $sql_filter .= ($check_key ?  $alias.'.' : '').pSQL($key).' = '.pSQL(trim($value)).' ';
+                            } else {
+                                $sql_filter .= ($check_key ?  $alias.'.' : '').pSQL($key).' LIKE \'%'.pSQL(trim($value)).'%\' ';
+                            }
                         }
                     }
                 }
@@ -1042,7 +1078,7 @@ class AdminControllerCore extends Controller
                 if ($this->filter && $this->action != 'reset_filters') {
                     $this->processFilter();
                 }
-                if (isset($_POST) && count($_POST) && (int)Tools::getValue('submitFilter'.$this->list_id) || Tools::isSubmit('submitReset'.$this->list_id)) {
+                if (empty($this->errors) && isset($_POST) && count($_POST) && (int)Tools::getValue('submitFilter'.$this->list_id) || Tools::isSubmit('submitReset'.$this->list_id)) {
                     $this->setRedirectAfter(self::$currentIndex.'&token='.$this->token.(Tools::isSubmit('submitFilter'.$this->list_id) ? '&submitFilter'.$this->list_id.'='.(int)Tools::getValue('submitFilter'.$this->list_id) : '').(isset($_GET['id_'.$this->list_id]) ? '&id_'.$this->list_id.'='.(int)$_GET['id_'.$this->list_id] : ''));
                 }