dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fixed access rights in employee permissions #PSCFV-3157

Browse Source
This commit is contained in:
dMetzger
2012-07-12 07:33:27 +00:00
parent fbdad2e97e
commit 16580ab714
2 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/controller/AdminController.php
View File

@@ -2105,9 +2105,9 @@ class AdminControllerCore extends Controller
{
if ($obj->id)
{
$result = Shop::getShopById((int)$obj->id, $this->identifier, $this->table);
$result = Shop::getShopById((int)$obj->id, $this->identifier, $this->table);
foreach ($result as $row)
$this->fields_value['shop'][$row['id_'.$input['type']]][] = $row[$this->identifier];
$this->fields_value['shop'][$row['id_'.$input['type']]][] = $row['id_shop'];
}
}
elseif (isset($input['lang']) && $input['lang'])
@@ -2363,10 +2363,8 @@ class AdminControllerCore extends Controller
$assos = array();
if (Tools::isSubmit('checkBoxShopAsso_'.$table))
{
foreach (Tools::getValue('checkBoxShopAsso_'.$table) as $id_shop => $value)
$assos[] = (int)$id_shop;
}
else if (Shop::getTotalShops(false) == 1)// if we do not have the checkBox multishop, we can have an admin with only one shop and being in multishop
$assos[] = (int)Shop::getContextShopID();
return $assos;