From dacdb760b15c745775b8cf8d65bf86f823f140da Mon Sep 17 00:00:00 2001 From: rMalie Date: Tue, 28 Feb 2012 09:41:16 +0000 Subject: [PATCH] // Add default group in group list on shop page git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13663 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminShopController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index d4116859c..d1150325d 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -33,7 +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->multishop_context = Shop::CONTEXT_ALL | Shop::CONTEXT_GROUP; $this->fieldsDisplay = array( 'id_shop' => array( @@ -301,8 +301,8 @@ class AdminShopControllerCore extends AdminController 'options' => array( 'query' => $options, 'id' => 'id_group_shop', - 'name' => 'name' - ) + 'name' => 'name', + ), ); } $categories = Category::getRootCategories($this->context->language->id); @@ -435,7 +435,7 @@ class AdminShopControllerCore extends AdminController ); $this->fields_value = array( - 'id_group_shop' => $obj->id_group_shop, + 'id_group_shop' => (isset($obj->id_group_shop)) ? $obj->id_group_shop : Shop::getContextGroupShopID(), 'active' => true, 'id_theme_checked' => isset($obj->id_theme) ? $obj->id_theme : $id_theme );