diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php index 7fa3f90be..455be47f4 100644 --- a/controllers/admin/AdminAttributesGroupsController.php +++ b/controllers/admin/AdminAttributesGroupsController.php @@ -53,6 +53,8 @@ class AdminAttributesGroupsControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + parent::__construct(); } @@ -66,8 +68,6 @@ class AdminAttributesGroupsControllerCore extends AdminController $this->addRowAction('delete'); $this->addRowAction('details'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - return parent::renderList(); } @@ -117,8 +117,6 @@ class AdminAttributesGroupsControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - // override attributes $this->display = 'list'; $this->tpl_folder = 'attributes/'; diff --git a/controllers/admin/AdminBackupController.php b/controllers/admin/AdminBackupController.php index e43568b8a..2e6eeee63 100644 --- a/controllers/admin/AdminBackupController.php +++ b/controllers/admin/AdminBackupController.php @@ -44,6 +44,8 @@ class AdminBackupControllerCore extends AdminController 'filesize' => array('title' => $this->l('File size')) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + $this->options = array( 'general' => array( 'title' => $this->l('Backup options'), @@ -73,7 +75,6 @@ class AdminBackupControllerCore extends AdminController { $this->addRowAction('view'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); return parent::renderList(); } diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index 3e767915e..f6764be72 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -80,6 +80,8 @@ class AdminCategoriesControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + if ($id_category = Tools::getvalue('id_category')) $this->_category = new Category($id_category); else @@ -102,8 +104,6 @@ class AdminCategoriesControllerCore extends AdminController $this->addRowAction('add'); $this->addRowAction('view'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->_filter .= ' AND `id_parent` = '.(int)$this->_category->id.' '; $this->_select = 'position '; diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index 193246c05..fdadcfbb3 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -45,6 +45,8 @@ class AdminCurrenciesControllerCore extends AdminController 'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false), ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + $this->options = array( 'general' => array( 'title' => $this->l('Currencies options'), @@ -86,7 +88,6 @@ class AdminCurrenciesControllerCore extends AdminController { $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); $this->_where = 'AND a.`deleted` = 0'; diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index 5bc062abc..3ec416cc0 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -58,6 +58,8 @@ class AdminFeaturesControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + parent::__construct(); } @@ -71,8 +73,6 @@ class AdminFeaturesControllerCore extends AdminController $this->addRowAction('delete'); $this->addRowAction('details'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - // Added specific button in toolbar $this->toolbar_btn['newAttributes'] = array( 'href' => self::$currentIndex.'&addfeature_value&token='.$this->token, @@ -108,8 +108,6 @@ class AdminFeaturesControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - if (!Validate::isLoadedObject($obj = new FeatureValue((int)$id))) $this->_errors[] = Tools::displayError('An error occurred while updating status for object.').' '.$this->table.' '.Tools::displayError('(cannot load object)'); diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index 6849b8888..c7e9ed8eb 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -90,6 +90,9 @@ class AdminLanguagesControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + $this->specificConfirmDelete = $this->l('When you delete a language, ALL RELATED TRANSLATIONS IN THE DATABASE WILL BE DELETED, are you sure you want to delete this language?', __CLASS__, true, false); + $this->options = array( 'general' => array( 'title' => $this->l('Languages options'), @@ -115,9 +118,6 @@ class AdminLanguagesControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->specificConfirmDelete = $this->l('When you delete a language, ALL RELATED TRANSLATIONS IN THE DATABASE WILL BE DELETED, are you sure you want to delete this language?', __CLASS__, true, false); - $this->displayWarning($this->l('When you delete a language, all related translations in the database will be deleted.')); return parent::renderList(); } diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 2482af567..f86b4bc59 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -132,8 +132,6 @@ class AdminManufacturersControllerCore extends AdminController $this->addRowAction('editaddresses'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - // test if a filter is applied for this list if (Tools::isSubmit('submitFilter'.$this->table) || $this->context->cookie->{'submitFilter'.$this->table} !== false) $this->filter = true; @@ -660,20 +658,6 @@ class AdminManufacturersControllerCore extends AdminController $this->action = 'save'; else if (Tools::isSubmit('deleteaddress')) $this->action = 'delete'; - else if (is_array($this->bulk_actions)) - { - foreach ($this->bulk_actions as $bulk_action => $params) - { - if (Tools::isSubmit('submitBulk'.$bulk_action.$this->table)) - { - $this->action = 'bulk'.$bulk_action; - $this->boxes = Tools::getValue($this->table.'Box'); - break; - } - } - if ($this->ajax && method_exists($this, 'ajaxPreprocess')) - $this->ajaxPreProcess(); - } } public function postProcess() diff --git a/controllers/admin/AdminReferrersController.php b/controllers/admin/AdminReferrersController.php index 0deac4975..53d23490c 100644 --- a/controllers/admin/AdminReferrersController.php +++ b/controllers/admin/AdminReferrersController.php @@ -138,6 +138,8 @@ class AdminReferrersControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + parent::__construct(); } @@ -148,8 +150,6 @@ class AdminReferrersControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->_select = 'SUM(sa.cache_visitors) AS cache_visitors, SUM(sa.cache_visits) AS cache_visits, SUM(sa.cache_pages) AS cache_pages, SUM(sa.cache_registrations) AS cache_registrations, SUM(sa.cache_orders) AS cache_orders, SUM(sa.cache_sales) AS cache_sales, IF(sa.cache_orders > 0, ROUND(sa.cache_sales/sa.cache_orders, 2), 0) as cart, (sa.cache_visits*click_fee) as fee0, diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index 22c82510e..68faea357 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -42,6 +42,7 @@ class AdminRequestSqlControllerCore extends AdminController 'name' => array('title' => $this->l('Name'), 'width' => 300), 'sql' => array('title' => $this->l('Request'), 'width' => 500) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?'))); parent::__construct(); } @@ -64,7 +65,6 @@ class AdminRequestSqlControllerCore extends AdminController $this->addRowAction('view'); $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?'))); return parent::renderList(); } diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 75b1d9645..015f5f63d 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -64,6 +64,8 @@ class AdminShopControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?'))); + $this->options = array( 'general' => array( 'title' => $this->l('Shops options'), @@ -102,8 +104,6 @@ class AdminShopControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?'))); - $this->_select = 'gs.name group_shop_name, cl.name category_name'; $this->_join = ' LEFT JOIN `'._DB_PREFIX_.'group_shop` gs diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index 584df416b..4e0204dcc 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -83,13 +83,13 @@ class AdminShopUrlControllerCore extends AdminController 'width' => 50, ), ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); parent::__construct(); } public function renderList() { - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); $this->addRowActionSkipList('delete', array(1)); $this->addRowAction('edit'); diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index 43c454577..ce8a10e55 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -50,6 +50,7 @@ class AdminSlipControllerCore extends AdminController 'align' => 'right' ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); $this->optionTitle = $this->l('Slip'); @@ -60,7 +61,6 @@ class AdminSlipControllerCore extends AdminController { $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); return parent::renderList(); } diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index 13b1e22c8..9a2dc3615 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -96,6 +96,8 @@ class AdminStatusesControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + parent::__construct(); } @@ -104,8 +106,6 @@ class AdminStatusesControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $list_orders_status = parent::renderList(); // Added new list diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index c976f61ee..ced00f156 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -68,6 +68,8 @@ class AdminStoresControllerCore extends AdminController 'active' => array('title' => $this->l('Enabled'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + $this->options = array( 'general' => array( 'title' => $this->l('Parameters'), @@ -117,8 +119,6 @@ class AdminStoresControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->_select = 'cl.`name` country, st.`name` state'; $this->_join = ' LEFT JOIN `'._DB_PREFIX_.'country_lang` cl diff --git a/controllers/admin/AdminTagsController.php b/controllers/admin/AdminTagsController.php index 0f5371234..7453ee433 100644 --- a/controllers/admin/AdminTagsController.php +++ b/controllers/admin/AdminTagsController.php @@ -55,6 +55,8 @@ class AdminTagsControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + parent::__construct(); } @@ -63,11 +65,6 @@ class AdminTagsControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array( - 'delete' => array('text' => $this->l('Delete selected'), - 'confirm' => $this->l('Delete selected items?')) - ); - $this->_select = 'l.name as lang, COUNT(pt.id_product) as products'; $this->_join = ' LEFT JOIN `'._DB_PREFIX_.'product_tag` pt diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index 44f5d6598..2aab9f17a 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -59,6 +59,8 @@ class AdminTaxRulesGroupControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + parent::__construct(); } @@ -67,8 +69,6 @@ class AdminTaxRulesGroupControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - return parent::renderList(); } @@ -111,8 +111,6 @@ class AdminTaxRulesGroupControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->_select = ' c.`name` AS country_name, s.`name` AS state_name, diff --git a/controllers/admin/AdminZonesController.php b/controllers/admin/AdminZonesController.php index 338e6f27d..f3033b0d4 100644 --- a/controllers/admin/AdminZonesController.php +++ b/controllers/admin/AdminZonesController.php @@ -55,6 +55,8 @@ class AdminZonesControllerCore extends AdminController ) ); + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + parent::__construct(); } @@ -63,8 +65,6 @@ class AdminZonesControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - return parent::renderList(); }