dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : Modules search now works even when filters are enabled

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12388 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fSerny
2012-01-12 09:51:45 +00:00
parent ff76996150
commit a185fd3b0a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminModulesController.php
+11 -6
View File
@@ -811,6 +811,17 @@ class AdminModulesControllerCore extends AdminController
return true; return true;
// Filter on module name
$filter_name = Tools::getValue('filtername');
if (!empty($filter_name))
{
if (stristr($module->name, $filter_name) === false && stristr($module->displayName, $filter_name) === false && stristr($module->description, $filter_name) === false)
return true;
else
return false;
}
// Filter on module category // Filter on module category
$categoryFiltered = array(); $categoryFiltered = array();
$filterCategories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)); $filterCategories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee));
@@ -862,12 +873,6 @@ class AdminModulesControllerCore extends AdminController
return true; return true;
// Filter on module name
$filter_name = Tools::getValue('filtername');
if (!empty($filter_name) AND (stristr($module->name, $filter_name) === false AND stristr($module->displayName, $filter_name) === false AND stristr($module->description, $filter_name) === false))
return true;
// Module has not been filtered // Module has not been filtered
return false; return false;
} }