From bf04b6464675e496705a66383b992ae5eeea09c2 Mon Sep 17 00:00:00 2001 From: sumit panwar Date: Thu, 21 Jan 2021 15:48:52 +0530 Subject: [PATCH] In the position filter when we search for position 1 we have to enter 0 in the filter input --- classes/controller/AdminController.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index b37114f0b..9d1a8b6d4 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -856,6 +856,12 @@ class AdminControllerCore extends Controller if (($type == 'date' || $type == 'datetime') && is_string($value)) { $value = json_decode($value, true); } + + // as in database 0 means position 1 in the renderlist + if (isset($field['position'])) { + $value -= 1; + } + $key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`'; // Assignment by reference @@ -3307,7 +3313,7 @@ class AdminControllerCore extends Controller $filter_modules_list = array($filter_modules_list); } - if (is_null($filter_modules_list) || empty($filter_modules_list)) { + if (is_null($filter_modules_list) || !count($filter_modules_list)) { return false; } //if there is no modules to display just return false; @@ -3500,9 +3506,9 @@ class AdminControllerCore extends Controller foreach ($languages as $language) { if (($value = Tools::getValue($field_lang.'_'.$language['id_lang'])) !== false && !empty($value)) { if (Tools::strtolower($function) == 'iscleanhtml' && Configuration::get('PS_ALLOW_HTML_IFRAME')) { - $res = Validate::{$function}($value, true); + $res = Validate::$function($value, true); } else { - $res = Validate::{$function}($value); + $res = Validate::$function($value); } if (!$res) { $this->errors[$field_lang.'_'.$language['id_lang']] = sprintf(