From d76bc47f264026e5ff86aedc7de4b0d8010a54ef Mon Sep 17 00:00:00 2001 From: rMalie Date: Fri, 24 Feb 2012 10:38:24 +0000 Subject: [PATCH] // Fix multishop_context --- controllers/admin/AdminCurrenciesController.php | 4 ++-- controllers/admin/AdminShopUrlController.php | 4 ++-- controllers/admin/AdminStockConfigurationController.php | 3 ++- controllers/admin/AdminStockCoverController.php | 3 ++- controllers/admin/AdminStockInstantStateController.php | 3 ++- controllers/admin/AdminStockManagementController.php | 3 ++- controllers/admin/AdminStockMvtController.php | 3 ++- controllers/admin/AdminSupplyOrdersController.php | 3 ++- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index 024f1ab80..8213a37c6 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -27,8 +27,6 @@ class AdminCurrenciesControllerCore extends AdminController { - public $display_multishop_toolbar = false; - public function __construct() { $this->table = 'currency'; @@ -82,6 +80,8 @@ class AdminCurrenciesControllerCore extends AdminController ) ); parent::__construct(); + + $this->multishop_context = Shop::CONTEXT_ALL; } public function renderList() diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index 74540b73c..e77b642a1 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -27,8 +27,6 @@ class AdminShopUrlControllerCore extends AdminController { - public $display_multishop_toolbar = false; - public function __construct() { $this->table = 'shop_url'; @@ -90,6 +88,8 @@ class AdminShopUrlControllerCore extends AdminController $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); parent::__construct(); + + $this->multishop_context = null; } public function renderList() diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php index 1c41be717..9f63f1ef4 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.php @@ -39,7 +39,6 @@ class AdminStockConfigurationControllerCore extends AdminController $this->table = 'stock_mvt_reason'; $this->className = 'StockMvtReason'; $this->lang = true; - $this->display_multishop_toolbar = false; // defines fields $this->fieldsDisplay = array( @@ -122,6 +121,8 @@ class AdminStockConfigurationControllerCore extends AdminController ); parent::__construct(); + + $this->multishop_context = null; } public function init() diff --git a/controllers/admin/AdminStockCoverController.php b/controllers/admin/AdminStockCoverController.php index b70bd790f..125102114 100644 --- a/controllers/admin/AdminStockCoverController.php +++ b/controllers/admin/AdminStockCoverController.php @@ -40,7 +40,6 @@ class AdminStockCoverControllerCore extends AdminController $this->className = 'Product'; $this->lang = true; $this->colorOnBackground = true; - $this->display_multishop_toolbar = false; $this->fieldsDisplay = array( 'reference' => array( @@ -104,6 +103,8 @@ class AdminStockCoverControllerCore extends AdminController array_unshift($this->stock_cover_warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses'))); parent::__construct(); + + $this->multishop_context = null; } /** diff --git a/controllers/admin/AdminStockInstantStateController.php b/controllers/admin/AdminStockInstantStateController.php index 29df291cd..a8491d076 100644 --- a/controllers/admin/AdminStockInstantStateController.php +++ b/controllers/admin/AdminStockInstantStateController.php @@ -38,7 +38,6 @@ class AdminStockInstantStateControllerCore extends AdminController $this->table = 'stock'; $this->className = 'Stock'; $this->lang = false; - $this->display_multishop_toolbar = false; $this->fieldsDisplay = array( 'reference' => array( @@ -103,6 +102,8 @@ class AdminStockInstantStateControllerCore extends AdminController array_unshift($this->stock_instant_state_warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses'))); parent::__construct(); + + $this->multishop_context = null; } /** diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php index fae930aea..9fee6f378 100644 --- a/controllers/admin/AdminStockManagementController.php +++ b/controllers/admin/AdminStockManagementController.php @@ -36,7 +36,6 @@ class AdminStockManagementControllerCore extends AdminController $this->table = 'product'; $this->className = 'Product'; $this->lang = true; - $this->display_multishop_toolbar = false; $this->fieldsDisplay = array( 'reference' => array( @@ -72,6 +71,8 @@ class AdminStockManagementControllerCore extends AdminController parent::__construct(); + $this->multishop_context = null; + // overrides confirmation messages specifically for this controller $this->_conf = array( 1 => $this->l('The product was successfully added to stock'), diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php index 183d9fa4a..cc3c7daa2 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -37,7 +37,6 @@ class AdminStockMvtControllerCore extends AdminController $this->className = 'StockMvt'; $this->identifier = 'id_stock_mvt'; $this->lang = false; - $this->display_multishop_toolbar = false; $this->list_no_link = true; $this->displayInformation($this->l('This interface allows you to display the stock movements for a selected warehouse.').'
'); @@ -116,6 +115,8 @@ class AdminStockMvtControllerCore extends AdminController ); parent::__construct(); + + $this->multishop_context = null; } /** diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index c6d33b31d..c6af5b13f 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -44,7 +44,6 @@ class AdminSupplyOrdersControllerCore extends AdminController $this->identifier = 'id_supply_order'; $this->lang = false; $this->is_template_list = false; - $this->display_multishop_toolbar = false; $this->addRowAction('updatereceipt'); $this->addRowAction('changestate'); @@ -114,6 +113,8 @@ class AdminSupplyOrdersControllerCore extends AdminController array_unshift($this->warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses'))); parent::__construct(); + + $this->multishop_context = null; } /**