diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index 71c83ccc6..e136e6623 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -37,7 +37,6 @@ class AdminAddressesControllerCore extends AdminController $this->table = 'address'; $this->className = 'Address'; $this->lang = false; - $this->requiredDatabase = true; $this->addressType = 'customer'; $this->context = Context::getContext(); diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 684f0750d..c2c16385b 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -40,7 +40,6 @@ class AdminCarriersControllerCore extends AdminController $this->addRowAction('delete'); $this->_defaultOrderBy = 'position'; - $this->requiredDatabase = true; $this->context = Context::getContext(); diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 1c896bccc..64346c9a1 100755 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -32,7 +32,6 @@ class AdminCartsControllerCore extends AdminController $this->table = 'cart'; $this->className = 'Cart'; $this->lang = false; - $this->requiredDatabase = true; $this->addRowAction('view'); $this->addRowAction('delete'); diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index 0cbba7dc4..b1d5ba3fb 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -36,8 +36,6 @@ class AdminCountriesControllerCore extends AdminController $this->addRowAction('edit'); - $this->requiredDatabase = true; - $this->context = Context::getContext(); $this->bulk_actions = array( diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 796e75b4c..a028fb250 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -45,8 +45,6 @@ class AdminEmployeesControllerCore extends AdminController $this->addRowAction('edit'); $this->addRowAction('delete'); - $this->requiredDatabase = true; - $this->context = Context::getContext(); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index d999f8e67..372230989 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -32,8 +32,6 @@ class AdminGendersControllerCore extends AdminController $this->table = 'gender'; $this->className = 'Gender'; $this->lang = true; - $this->requiredDatabase = true; - $this->addRowAction('edit'); $this->addRowAction('delete'); diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index 2b11083c8..486a90c90 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -35,8 +35,6 @@ class AdminLanguagesControllerCore extends AdminController $this->deleted = false; $this->multishop_context = Shop::CONTEXT_ALL; - $this->requiredDatabase = true; - $this->context = Context::getContext(); $this->fieldImageSettings = array( diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 16cea0bd3..84c7e4cf1 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -39,8 +39,6 @@ class AdminManufacturersControllerCore extends AdminController $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); - $this->requiredDatabase = true; - $this->context = Context::getContext(); $this->fieldImageSettings = array( diff --git a/controllers/admin/AdminOrderMessageController.php b/controllers/admin/AdminOrderMessageController.php index 7ba536c08..53fa67ca1 100644 --- a/controllers/admin/AdminOrderMessageController.php +++ b/controllers/admin/AdminOrderMessageController.php @@ -32,7 +32,6 @@ class AdminOrderMessageControllerCore extends AdminController $this->table = 'order_message'; $this->className = 'OrderMessage'; $this->lang = true; - $this->requiredDatabase = true; $this->addRowAction('edit'); $this->addRowAction('delete'); diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index b7ac260e9..5537edbe2 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -37,7 +37,6 @@ class AdminOrdersControllerCore extends AdminController $this->addRowAction('view'); $this->deleted = false; - $this->requiredDatabase = false; $this->context = Context::getContext(); $this->_select = ' diff --git a/controllers/admin/AdminQuickAccessesController.php b/controllers/admin/AdminQuickAccessesController.php index e509e656d..18caf0351 100644 --- a/controllers/admin/AdminQuickAccessesController.php +++ b/controllers/admin/AdminQuickAccessesController.php @@ -32,7 +32,6 @@ class AdminQuickAccessesControllerCore extends AdminController $this->table = 'quick_access'; $this->className = 'QuickAccess'; $this->lang = true; - $this->requiredDatabase = true; $this->addRowAction('edit'); $this->addRowAction('delete'); diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index 82ee0eff0..506b3bae5 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -41,7 +41,6 @@ class AdminRequestSqlControllerCore extends AdminController $this->className = 'RequestSql'; $this->lang = false; $this->export = true; - $this->requiredDatabase = true; $this->context = Context::getContext(); diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index 9517692d1..406e4227f 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/controllers/admin/AdminSearchConfController.php @@ -34,7 +34,6 @@ class AdminSearchConfControllerCore extends AdminController $this->table = 'alias'; $this->className = 'Alias'; $this->lang = false; - $this->requiredDatabase = true; parent::__construct(); diff --git a/controllers/admin/AdminSearchEnginesController.php b/controllers/admin/AdminSearchEnginesController.php index 5b68ce82c..5aa9a6a45 100644 --- a/controllers/admin/AdminSearchEnginesController.php +++ b/controllers/admin/AdminSearchEnginesController.php @@ -32,7 +32,6 @@ class AdminSearchEnginesControllerCore extends AdminController $this->table = 'search_engine'; $this->className = 'SearchEngine'; $this->lang = false; - $this->requiredDatabase = true; $this->addRowAction('edit'); $this->addRowAction('delete'); diff --git a/controllers/admin/AdminShopGroupController.php b/controllers/admin/AdminShopGroupController.php index 6f93f2317..6e6cccedd 100644 --- a/controllers/admin/AdminShopGroupController.php +++ b/controllers/admin/AdminShopGroupController.php @@ -32,7 +32,6 @@ class AdminShopGroupControllerCore extends AdminController $this->table = 'shop_group'; $this->className = 'ShopGroup'; $this->lang = false; - $this->requiredDatabase = true; $this->multishop_context = Shop::CONTEXT_ALL; $this->addRowAction('edit'); diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index 370126e9a..c061833ba 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -42,8 +42,6 @@ class AdminStatusesControllerCore extends AdminController 'dir' => 'os' ); - $this->requiredDatabase = true; - $this->fieldImageSettings = array( 'name' => 'icon', 'dir' => 'os' @@ -100,6 +98,12 @@ class AdminStatusesControllerCore extends AdminController parent::__construct(); } + + + + + + public function renderList() { @@ -149,7 +153,6 @@ class AdminStatusesControllerCore extends AdminController // call postProcess() for take care about actions and filters $this->postProcess(); - $this->toolbar_title = $this->l('Return statuses'); $list_orders_returns_status = parent::renderList(); @@ -393,7 +396,7 @@ class AdminStatusesControllerCore extends AdminController switch ($this->display) { case 'editstatus': - $this->toolbar_btn['save'] = array( + $this->toolbar_btn['add'] = array( 'href' => '#', 'desc' => $this->l('Save') ); @@ -411,7 +414,6 @@ class AdminStatusesControllerCore extends AdminController ); } break; - default: parent::initToolbar(); } diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index 71c2a7049..bbef20f8b 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -32,7 +32,6 @@ class AdminStoresControllerCore extends AdminController $this->table = 'store'; $this->className = 'Store'; $this->lang = false; - $this->requiredDatabase = true; $this->toolbar_scroll = false; $this->context = Context::getContext();