From e8a16e0049c94da5ae400f391f9fc84c74313aba Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Wed, 1 Feb 2012 15:31:22 +0000 Subject: [PATCH] [-] BO : #PSTEST-624 - On creating a new carrier, all groups of the group box must be selected --- controllers/admin/AdminCarriersController.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 52f71476c..744080406 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -584,14 +584,9 @@ class AdminCarriersControllerCore extends AdminController $carrier_groups_ids[] = $carrier_group['id_group']; $groups = Group::getGroups($this->context->language->id); - // if empty $carrier_groups_ids : object creation : we set the default groups - if (empty($carrier_groups_ids) && !$obj->id) - { - $preselected = array(Configuration::get('PS_UNIDENTIFIED_GROUP'), Configuration::get('PS_GUEST_GROUP'), Configuration::get('PS_CUSTOMER_GROUP')); - $carrier_groups_ids = array_merge($carrier_groups_ids, $preselected); - } + foreach ($groups as $group) - $this->fields_value['groupBox_'.$group['id_group']] = Tools::getValue('groupBox_'.$group['id_group'], (in_array($group['id_group'], $carrier_groups_ids))); + $this->fields_value['groupBox_'.$group['id_group']] = Tools::getValue('groupBox_'.$group['id_group'], (in_array($group['id_group'], $carrier_groups_ids) || empty($carrier_groups_ids) && !$obj->id)); } public function beforeDelete($object)