// Improve multishop code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10982 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:08:48 +00:00
parent 5b9e12bba1
commit 1172e7a8d0
4 changed files with 29 additions and 15 deletions
@@ -194,16 +194,25 @@ class AdminShopControllerCore extends AdminController
 			);
 		}
 		else
+		{
+			$options = array();
+			foreach (GroupShop::getGroupShops() as $group)
+				$options[] = array(
+					'id_group_shop' =>	$group->id,
+					'name' =>			$group->name,
+				);
+
 			$this->fields_form['input'][] = array(
 				'type' => 'select',
 				'label' => $this->l('Group Shop:'),
 				'name' => 'id_group_shop',
 				'options' => array(
-					'query' => GroupShop::getGroupShops(),
+					'query' => $options,
 					'id' => 'id_group_shop',
 					'name' => 'name'
 				)
 			);
+		}

 		$categories = Category::getCategories($this->context->language->id, false, false);
 		$this->fields_form['input'][] = array(