From ffbb4cd3e25ac1dfb5a146164ba5a969751b663e Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 27 Feb 2012 17:14:33 +0000 Subject: [PATCH] // Fix multishop context in BO --- classes/controller/AdminController.php | 5 +++-- controllers/admin/AdminCurrenciesController.php | 2 +- controllers/admin/AdminGroupShopController.php | 3 +-- controllers/admin/AdminHomeController.php | 2 +- controllers/admin/AdminLanguagesController.php | 1 + controllers/admin/AdminShopController.php | 3 +-- controllers/admin/AdminShopUrlController.php | 3 +-- 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 +-- 13 files changed, 15 insertions(+), 22 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index ee1eae5f8..620c4f1cd 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -255,7 +255,7 @@ class AdminControllerCore extends Controller */ public $controller_name; - public $multishop_context; + public $multishop_context = -1; public function __construct() { @@ -266,7 +266,8 @@ class AdminControllerCore extends Controller parent::__construct(); - $this->multishop_context = Shop::CONTEXT_ALL | Shop::CONTEXT_GROUP | Shop::CONTEXT_SHOP; + if ($this->multishop_context == -1) + $this->multishop_context = Shop::CONTEXT_ALL | Shop::CONTEXT_GROUP | Shop::CONTEXT_SHOP; $this->bo_theme = ((Validate::isLoadedObject($this->context->employee) && $this->context->employee->bo_theme) ? $this->context->employee->bo_theme : 'default'); $this->context->smarty->setTemplateDir(_PS_BO_ALL_THEMES_DIR_.$this->bo_theme.'/template'); diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index ac5bb5ee2..dc99b79f6 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -32,9 +32,9 @@ class AdminCurrenciesControllerCore extends AdminController $this->table = 'currency'; $this->className = 'Currency'; $this->lang = false; + $this->multishop_context = Shop::CONTEXT_ALL; parent::__construct(); - $this->multishop_context = Shop::CONTEXT_ALL; } public function init() diff --git a/controllers/admin/AdminGroupShopController.php b/controllers/admin/AdminGroupShopController.php index 5aa4e0abe..c9cf6a0bf 100644 --- a/controllers/admin/AdminGroupShopController.php +++ b/controllers/admin/AdminGroupShopController.php @@ -33,6 +33,7 @@ class AdminGroupShopControllerCore extends AdminController $this->className = 'GroupShop'; $this->lang = false; $this->requiredDatabase = true; + $this->multishop_context = Shop::CONTEXT_ALL; $this->addRowAction('edit'); @@ -67,8 +68,6 @@ class AdminGroupShopControllerCore extends AdminController ); parent::__construct(); - - $this->multishop_context = null; } public function renderForm() diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 013cfeaa9..4804859f9 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -31,8 +31,8 @@ class AdminHomeControllerCore extends AdminController public function __construct() { + $this->multishop_context = Shop::CONTEXT_ALL; parent::__construct(); - $this->multishop_context = null; } protected function _displayOptimizationTips() diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index 261f10898..ce565f64d 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -33,6 +33,7 @@ class AdminLanguagesControllerCore extends AdminController $this->className = 'Language'; $this->lang = false; $this->deleted = false; + $this->multishop_context = Shop::CONTEXT_ALL; $this->requiredDatabase = true; diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 401861d3b..d4116859c 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -33,6 +33,7 @@ class AdminShopControllerCore extends AdminController $this->context = Context::getContext(); $this->table = 'shop'; $this->className = 'Shop'; + $this->multishop_context = Shop::CONTEXT_ALL | Shop::CONTEXT_SHOP; $this->fieldsDisplay = array( 'id_shop' => array( @@ -92,8 +93,6 @@ class AdminShopControllerCore extends AdminController ); parent::__construct(); - - $this->multishop_context ^= Shop::CONTEXT_SHOP; } public function initToolbar() diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index e77b642a1..9a5054125 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -33,6 +33,7 @@ class AdminShopUrlControllerCore extends AdminController $this->className = 'ShopUrl'; $this->lang = false; $this->requiredDatabase = true; + $this->multishop_context = Shop::CONTEXT_ALL; $this->context = Context::getContext(); @@ -88,8 +89,6 @@ 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 9f63f1ef4..f476ebd19 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.php @@ -39,6 +39,7 @@ class AdminStockConfigurationControllerCore extends AdminController $this->table = 'stock_mvt_reason'; $this->className = 'StockMvtReason'; $this->lang = true; + $this->multishop_context = Shop::CONTEXT_ALL; // defines fields $this->fieldsDisplay = array( @@ -121,8 +122,6 @@ 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 125102114..ec38f2a8c 100644 --- a/controllers/admin/AdminStockCoverController.php +++ b/controllers/admin/AdminStockCoverController.php @@ -40,6 +40,7 @@ class AdminStockCoverControllerCore extends AdminController $this->className = 'Product'; $this->lang = true; $this->colorOnBackground = true; + $this->multishop_context = Shop::CONTEXT_ALL; $this->fieldsDisplay = array( 'reference' => array( @@ -103,8 +104,6 @@ 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 a8491d076..9890459ca 100644 --- a/controllers/admin/AdminStockInstantStateController.php +++ b/controllers/admin/AdminStockInstantStateController.php @@ -38,6 +38,7 @@ class AdminStockInstantStateControllerCore extends AdminController $this->table = 'stock'; $this->className = 'Stock'; $this->lang = false; + $this->multishop_context = Shop::CONTEXT_ALL; $this->fieldsDisplay = array( 'reference' => array( @@ -102,8 +103,6 @@ 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 508499418..e51163fd5 100644 --- a/controllers/admin/AdminStockManagementController.php +++ b/controllers/admin/AdminStockManagementController.php @@ -36,6 +36,7 @@ class AdminStockManagementControllerCore extends AdminController $this->table = 'product'; $this->className = 'Product'; $this->lang = true; + $this->multishop_context = Shop::CONTEXT_ALL; $this->fieldsDisplay = array( 'reference' => array( @@ -71,8 +72,6 @@ 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 20549e8df..ed2706de1 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -37,6 +37,7 @@ class AdminStockMvtControllerCore extends AdminController $this->className = 'StockMvt'; $this->identifier = 'id_stock_mvt'; $this->lang = false; + $this->multishop_context = Shop::CONTEXT_ALL; $this->list_no_link = true; $this->displayInformation($this->l('This interface allows you to display the stock movements for a selected warehouse.').'
'); @@ -115,8 +116,6 @@ class AdminStockMvtControllerCore extends AdminController ); parent::__construct(); - - $this->multishop_context = null; } /** diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index f0d829657..b130b088f 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -44,6 +44,7 @@ class AdminSupplyOrdersControllerCore extends AdminController $this->identifier = 'id_supply_order'; $this->lang = false; $this->is_template_list = false; + $this->multishop_context = Shop::CONTEXT_ALL; $this->addRowAction('updatereceipt'); $this->addRowAction('changestate'); @@ -113,8 +114,6 @@ class AdminSupplyOrdersControllerCore extends AdminController array_unshift($this->warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses'))); parent::__construct(); - - $this->multishop_context = null; } /**