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

// Fix attributes values form page for multishop #PSTEST-780

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14243 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-03-23 15:44:30 +00:00
parent 740784d1a0
commit 4042e00440
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAttributesGroupsController.php
+3 -2
View File
@@ -294,7 +294,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
$associations = array();
foreach (Db::getInstance()->executeS($sql) as $row)
$associations[$row['id_attribute_group']][] = $row['id_group_shop'];
$this->fields_form['shop_associations'] = Tools::jsonEncode($associations);
$this->fields_form['input'][] = array(
'type' => 'group_shop',
@@ -303,8 +302,10 @@ class AdminAttributesGroupsControllerCore extends AdminController
'values' => Shop::getTree()
);
}
else
$associations = array();
$this->fields_form['shop_associations'] = Tools::jsonEncode(array());
$this->fields_form['shop_associations'] = Tools::jsonEncode($associations);
$this->fields_form['input'][] = array(
'type' => 'color',
'label' => $this->l('Color:'),