diff --git a/admin/themes/default/template/controllers/modules/js.tpl b/admin/themes/default/template/controllers/modules/js.tpl index 2491c13fa..1daef2d32 100644 --- a/admin/themes/default/template/controllers/modules/js.tpl +++ b/admin/themes/default/template/controllers/modules/js.tpl @@ -63,10 +63,6 @@ } } - if (!module_list.length) { - return false; - } - module_list = encodeURIComponent(module_list.join('|')); if (action == 'bulk_enable' || action == 'bulk_disable') { var type = action == 'bulk_disable' ? 'disabled' : 'enabled'; diff --git a/admin/themes/default/template/controllers/modules/list.tpl b/admin/themes/default/template/controllers/modules/list.tpl index 6b0db2f51..8acf25921 100644 --- a/admin/themes/default/template/controllers/modules/list.tpl +++ b/admin/themes/default/template/controllers/modules/list.tpl @@ -203,6 +203,12 @@
  • +
  • + +   + {l s='Install the selection'} + +
  •   diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 67d88e69a..5c840d95b 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -527,7 +527,10 @@ class AdminControllerCore extends Controller 29 => $this->l('Successful upgrade'), 30 => $this->l('A partial refund was successfully created.'), 31 => $this->l('The discount was successfully generated.'), - 32 => $this->l('Successfully signed in to PrestaShop Addons') + 32 => $this->l('Successfully signed in to PrestaShop Addons'), + 33 => $this->l('The selected module(s) have been successfully enabled.'), + 34 => $this->l('The selected module(s) have been successfully disabled.'), + ); if (!$this->identifier) { diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 7f3409e0c..2161a3a5a 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -1080,6 +1080,7 @@ class AdminModulesControllerCore extends AdminController } if (empty($moduleNames)) { + $this->errors[] = Tools::displayError('You must select at least one module to perform a bulk action.'); return; } @@ -1119,7 +1120,7 @@ class AdminModulesControllerCore extends AdminController } } Configuration::updateValue('PS_SHOW_ENABLED_MODULES_' . (int)$this->id_employee, $moduleStatus); - Tools::redirectAdmin($this->getCurrentUrl(array('bulk_enable', 'type', 'modules'))); + Tools::redirectAdmin($this->getCurrentUrl(array('bulk_enable', 'type', 'modules', 'conf')).'&conf='.($moduleStatus === 'enabled' ? '33' : '34')); } }else{