From f1d8763d35ddedb30d2914ffed7821167c322fb4 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Mon, 27 Feb 2012 17:03:58 +0000
Subject: [PATCH] // Fix auth issues for multishop

---
 admin-dev/functions.php                        | 8 ++------
 classes/shop/Shop.php                          | 1 -
 controllers/admin/AdminEmployeesController.php | 1 +
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/admin-dev/functions.php b/admin-dev/functions.php
index 07c29ca4b..44518a376 100644
--- a/admin-dev/functions.php
+++ b/admin-dev/functions.php
@@ -412,15 +412,11 @@ function generateShopList()
 	$url = $_SERVER['REQUEST_URI'].(($_SERVER['QUERY_STRING']) ? '&' : '?').'setShopContext=';
 	$html = '<select class="shopList chosen" onchange="location.href = \''.$url.'\'+$(this).val();">';
 
-	if ($context->employee->id_profile == _PS_ADMIN_PROFILE_ ||
-					$context->shop->getTotalShopsWhoExists() == Employee::getTotalEmployeeShopById($context->employee->id))
-		$html .= '<option value="" class="first">'.translate('All shops').'</option>';
-	/*$html .= (Context::getContext()->employee->id_profile == _PS_ADMIN_PROFILE_) ? '<option value="" class="first">'.translate('All shops').'</option>' : '';*/
+	$html .= '<option value="" class="first">'.translate('All shops').'</option>';
 	foreach ($tree as $gID => $group_data)
 	{
-		$disabled = ($group_data['totalShops'] != count($group_data['shops'])) ? 'disabled="disabled"' : '';
 		if ($context->controller->multishop_context & Shop::CONTEXT_GROUP)
-			$html .= '<option class="group" value="g-'.$gID.'" '.(($value == 'g-'.$gID) ? 'selected="selected"' : '').' '.$disabled.'>'.translate('Group:').' '.htmlspecialchars($group_data['name']).'</option>';
+			$html .= '<option class="group" value="g-'.$gID.'" '.(($value == 'g-'.$gID) ? 'selected="selected"' : '').'>'.translate('Group:').' '.htmlspecialchars($group_data['name']).'</option>';
 		else
 			$html .= '<optgroup class="group" label="'.translate('Group:').' '.htmlspecialchars($group_data['name']).'">';
 
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index a53255b4f..15f387bf6 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -461,7 +461,6 @@ class ShopCore extends ObjectModel
 
 		if ($results = Db::getInstance()->executeS($sql))
 		{
-			$group_shop = new GroupShop();
 			foreach ($results as $row)
 			{
 				if (!isset(self::$shops[$row['id_group_shop']]))
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index 96dc5c2dc..4e7d4c351 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -292,6 +292,7 @@ class AdminEmployeesControllerCore extends AdminController
 				$this->fields_form['input'][] = array(
 					'type' => 'shop',
 					'label' => $this->l('Shop association:'),
+					'desc' => $this->l('Select the shops the employee is allowed to access'),
 					'name' => 'checkBoxShopAsso',
 				);
 			}