From fb5e6841a8f02b6bf12fd78804e5dc07c554077b Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 28 Jun 2012 22:12:31 +0000 Subject: [PATCH] [-] BO: Fix PSCFV-2754 keep informations on form validation error git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16157 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminShopGroupController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminShopGroupController.php b/controllers/admin/AdminShopGroupController.php index bdf01739d..989316bdb 100644 --- a/controllers/admin/AdminShopGroupController.php +++ b/controllers/admin/AdminShopGroupController.php @@ -146,7 +146,7 @@ class AdminShopGroupControllerCore extends AdminController 'required' => true, 'class' => 't', 'is_bool' => true, - 'disabled' => ($this->display == 'edit' && ShopGroup::hasDependency($this->id_object, 'customer')) ? true : false, + 'disabled' => ($this->id_object && $this->display == 'edit' && ShopGroup::hasDependency($this->id_object, 'customer')) ? true : false, 'values' => array( array( 'id' => 'share_customer_on', @@ -189,7 +189,7 @@ class AdminShopGroupControllerCore extends AdminController 'required' => true, 'class' => 't', 'is_bool' => true, - 'disabled' => ($this->display == 'edit' && ShopGroup::hasDependency($this->id_object, 'order')) ? true : false, + 'disabled' => ($this->id_object && $this->display == 'edit' && ShopGroup::hasDependency($this->id_object, 'order')) ? true : false, 'values' => array( array( 'id' => 'share_order_on', @@ -204,7 +204,7 @@ class AdminShopGroupControllerCore extends AdminController ), 'desc' => $this->l('Once this option is enabled (which is only possible if customers and available quantities are shared among shops), the customer\'s cart will be shared among all the shops in this group. This way, any purchase started on one of the shops in this group will be able to be finished in another shop from the same shop group. Warning: you won\'t be able to disable this option once you have orders on at least one shop of this group.') ), - /*array( + array( 'type' => 'radio', 'label' => $this->l('Status:'), 'name' => 'active', @@ -224,7 +224,7 @@ class AdminShopGroupControllerCore extends AdminController ) ), 'desc' => $this->l('Enable or disable group shop') - )*/ + ) ), 'submit' => array( 'title' => $this->l('Save'),