From 4921c53f353819c2cd97ade6b7d67a352e59ff17 Mon Sep 17 00:00:00 2001 From: fSerny Date: Mon, 9 Jan 2012 17:45:36 +0000 Subject: [PATCH] [-] BO : Modules search works with all modules even when a filter is enabled git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12290 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminModulesController.php | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index e9c4b0cef..cf2bb42eb 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -922,6 +922,16 @@ class AdminModulesControllerCore extends AdminController if (isset($module->warning) && !empty($module->warning)) $this->warnings[] = ''.$module->displayName.' : '.$module->warning; + // AutoComplete array + $autocompleteList .= Tools::jsonEncode(array( + 'displayName' => (string)$module->displayName, + 'desc' => (string)$module->description, + 'name' => (string)$module->name, + 'author' => (string)$module->author, + 'image' => (isset($module->image) ? (string)$module->image : ''), + 'option' => '', + )).', '; + // Apply filter if ($this->isModuleFiltered($module)) unset($modules[$km]); @@ -940,17 +950,6 @@ class AdminModulesControllerCore extends AdminController $modules[$km]->options['uninstall_onclick'] = ((!method_exists($module, 'onclickOption')) ? ((empty($module->confirmUninstall)) ? '' : 'return confirm(\''.addslashes($module->confirmUninstall).'\');') : $module->onclickOption('uninstall', $modules[$km]->options['uninstall_url'])); if (Tools::getValue('module_name') == $module->name && (int)Tools::getValue('conf') > 0) $modules[$km]->message = $this->_conf[(int)Tools::getValue('conf')]; - - // AutoComplete array - $autocompleteList .= Tools::jsonEncode(array( - 'displayName' => (string)$module->displayName, - 'desc' => (string)$module->description, - 'name' => (string)$module->name, - 'author' => (string)$module->author, - 'image' => (isset($module->image) ? (string)$module->image : ''), - //'option' => $this->displayModuleOptions($module), - 'option' => '', - )).', '; } unset($object); }