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

// MERGE product_multistore branch : product fields are now editable per shop

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-04-17 13:32:12 +00:00
parent d4d1c35cb9
commit 0c2dd0cd2f
134 changed files with 3185 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAttributesGroupsController.php
+6 -6
View File
@@ -232,8 +232,8 @@ class AdminAttributesGroupsControllerCore extends AdminController
if (Shop::isFeatureActive())
{
$this->fields_form['input'][] = array(
'type' => 'group_shop',
'label' => $this->l('Group Shop association:'),
'type' => 'shop',
'label' => $this->l('Shop association:'),
'name' => 'checkBoxShopAsso',
);
}
@@ -290,14 +290,14 @@ class AdminAttributesGroupsControllerCore extends AdminController
{
// We get all associated shops for all attribute groups, because we will disable group shops
// for attributes that the selected attribute group don't support
$sql = 'SELECT id_attribute_group, id_group_shop FROM '._DB_PREFIX_.'attribute_group_group_shop';
$sql = 'SELECT id_attribute_group, id_shop FROM '._DB_PREFIX_.'attribute_group_shop';
$associations = array();
foreach (Db::getInstance()->executeS($sql) as $row)
$associations[$row['id_attribute_group']][] = $row['id_group_shop'];
$associations[$row['id_attribute_group']][] = $row['id_shop_group'];
$this->fields_form['input'][] = array(
'type' => 'group_shop',
'label' => $this->l('Group Shop association:'),
'type' => 'shop',
'label' => $this->l('Shop association:'),
'name' => 'checkBoxShopAsso',
'values' => Shop::getTree()
);