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

//module anchor now use instant search to filter module list

Browse Source
This commit is contained in:
Vincent Augagneur
2013-10-16 16:09:44 +02:00
parent dfd00bb064
commit c684fa13cb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/modules/js.tpl
+2 -2
View File
@@ -64,8 +64,8 @@
$('document').ready( function() { $('document').ready( function() {
// ScrollTo // ScrollTo
if (anchor != '') if (anchor != '')
$.scrollTo('#'+anchor, 1200, {offset: -100}); $.uiTableFilter($('#moduleContainer').find('table'), anchor);
$('#moduleQuicksearch').keyup(function() { $('#moduleQuicksearch').keyup(function() {
console.log(this.value); console.log(this.value);
$.uiTableFilter($('#moduleContainer').find('table'), this.value); $.uiTableFilter($('#moduleContainer').find('table'), this.value);
controllers/admin/AdminModulesController.php
+4 -4
View File
@@ -401,7 +401,7 @@ class AdminModulesControllerCore extends AdminController
@unlink($file); @unlink($file);
$this->recursiveDeleteOnDisk($tmp_folder); $this->recursiveDeleteOnDisk($tmp_folder);
if ($success && $redirect) if ($success && $redirect)
Tools::redirectAdmin(self::$currentIndex.'&conf=8&anchor=anchor'.ucfirst($folder).'&token='.$this->token); Tools::redirectAdmin(self::$currentIndex.'&conf=8&anchor='.ucfirst($folder).'&token='.$this->token);
return $success; return $success;
} }
@@ -497,7 +497,7 @@ class AdminModulesControllerCore extends AdminController
{ {
if ($module->uninstall()) if ($module->uninstall())
if ($module->install()) if ($module->install())
Tools::redirectAdmin(self::$currentIndex.'&conf=21'.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name)); Tools::redirectAdmin(self::$currentIndex.'&conf=21'.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name));
else else
$this->errors[] = Tools::displayError('Cannot install this module.'); $this->errors[] = Tools::displayError('Cannot install this module.');
else else
@@ -777,11 +777,11 @@ class AdminModulesControllerCore extends AdminController
// If redirect parameter is present and module installed with success, we redirect on configuration module page // If redirect parameter is present and module installed with success, we redirect on configuration module page
if (Tools::getValue('redirect') == 'config' && Tools::getValue('module_name') != '' && $return == '12' && Module::isInstalled(pSQL(Tools::getValue('module_name')))) if (Tools::getValue('redirect') == 'config' && Tools::getValue('module_name') != '' && $return == '12' && Module::isInstalled(pSQL(Tools::getValue('module_name'))))
Tools::redirectAdmin('index.php?controller=adminmodules&configure='.Tools::getValue('module_name').'&token='.Tools::getValue('token').'&module_name='.Tools::getValue('module_name').$params); Tools::redirectAdmin('index.php?controller=adminmodules&configure='.Tools::getValue('module_name').'&token='.Tools::getValue('token').'&module_name='.Tools::getValue('module_name').$params);
Tools::redirectAdmin(self::$currentIndex.'&conf='.$return.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : '').$params); Tools::redirectAdmin(self::$currentIndex.'&conf='.$return.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : '').$params);
} }
if (isset($_GET['update'])) if (isset($_GET['update']))
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&updated=1tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : '')); Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&updated=1tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : ''));
} }
public function postProcess() public function postProcess()
controllers/admin/AdminSearchController.php
+2 -2
View File
@@ -145,7 +145,7 @@ class AdminSearchControllerCore extends AdminController
{ {
/* Handle module name */ /* Handle module name */
if ($searchType == 7 && Validate::isModuleName($this->query) AND ($module = Module::getInstanceByName($this->query)) && Validate::isLoadedObject($module)) if ($searchType == 7 && Validate::isModuleName($this->query) AND ($module = Module::getInstanceByName($this->query)) && Validate::isLoadedObject($module))
Tools::redirectAdmin('index.php?tab=AdminModules&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).'&token='.Tools::getAdminTokenLite('AdminModules')); Tools::redirectAdmin('index.php?tab=AdminModules&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name).'&token='.Tools::getAdminTokenLite('AdminModules'));
/* Normal catalog search */ /* Normal catalog search */
$this->searchModule(); $this->searchModule();
@@ -194,7 +194,7 @@ class AdminSearchControllerCore extends AdminController
foreach ($all_modules as $module) foreach ($all_modules as $module)
if (stripos($module->name, $this->query) !== false || stripos($module->displayName, $this->query) !== false || stripos($module->description, $this->query) !== false) if (stripos($module->name, $this->query) !== false || stripos($module->displayName, $this->query) !== false || stripos($module->description, $this->query) !== false)
{ {
$module->linkto = 'index.php?tab=AdminModules&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).'&token='.Tools::getAdminTokenLite('AdminModules'); $module->linkto = 'index.php?tab=AdminModules&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name).'&token='.Tools::getAdminTokenLite('AdminModules');
$this->_list['modules'][] = $module; $this->_list['modules'][] = $module;
} }
} }