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

[*] BO : #PI-123 - toolbar and page title refactoring

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14594 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-04-12 08:34:38 +00:00
parent ff98873fb5
commit 244a2f9102
24 changed files with 162 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
controllers/admin/AdminModulesController.php
View File

@@ -409,11 +409,6 @@ class AdminModulesControllerCore extends AdminController
}
}
/*
** Filter Configuration Methods
** Set and reset filter configuration
@@ -436,9 +431,6 @@ class AdminModulesControllerCore extends AdminController
Configuration::updateValue('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee, '');
}
/*
** Post Process Filter
**
@@ -470,11 +462,6 @@ class AdminModulesControllerCore extends AdminController
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
}
/*
** Post Process Module CallBack
**
@@ -875,12 +862,10 @@ class AdminModulesControllerCore extends AdminController
return false;
}
// Filter on interest
if ((int)Db::getInstance()->getValue('SELECT `id_module_preference` FROM `'._DB_PREFIX_.'module_preference` WHERE `module` = \''.pSQL($module->name).'\' AND `id_employee` = '.(int)$this->id_employee.' AND `interest` = 0') > 0)
return true;
// Filter on favorites
if (Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee) == 'favorites')
{
@@ -904,7 +889,6 @@ class AdminModulesControllerCore extends AdminController
return true;
}
// Filter on module type and author
$show_type_modules = $this->filter_configuration['PS_SHOW_TYPE_MODULES_'.(int)$this->id_employee];
if ($show_type_modules == 'nativeModules' && !in_array($module->name, $this->list_natives_modules))
@@ -924,7 +908,6 @@ class AdminModulesControllerCore extends AdminController
return true;
}
// Filter on install status
$show_installed_modules = $this->filter_configuration['PS_SHOW_INSTALLED_MODULES_'.(int)$this->id_employee];
if ($show_installed_modules == 'installed' && !$module->id)
@@ -940,7 +923,6 @@ class AdminModulesControllerCore extends AdminController
if ($show_enabled_modules == 'disabled' && $module->active)
return true;
// Filter on country
$show_country_modules = $this->filter_configuration['PS_SHOW_COUNTRY_MODULES_'.(int)$this->id_employee];
if ($show_country_modules && (isset($module->limited_countries) && !empty($module->limited_countries)
@@ -949,7 +931,6 @@ class AdminModulesControllerCore extends AdminController
|| (!is_array($module->limited_countries) && strtolower($this->iso_default_country) != strval($module->limited_countries)))))
return true;
// Module has not been filtered
return false;
}
@@ -990,7 +971,6 @@ class AdminModulesControllerCore extends AdminController
$modules_preferences[$v['module']] = $v;
}
// Retrieve Modules List
$modules = Module::getModulesOnDisk(true, $this->logged_on_addons);
$this->initModulesList($modules);