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

// id_category_default fix

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13634 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot committed 2012-02-27 15:42:48 +00:00
1 parent 1882cbcf14
commit 78334a05a6
2 files changed
+16 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/Product.php
+11 -6
View File
@@ -4830,14 +4830,19 @@ class ProductCore extends ObjectModel
WHERE `id_product` = '.(int)$id_product); WHERE `id_product` = '.(int)$id_product);
} }
public function updateCategoryDefault($shop = null) public function updateCategoryDefault($shop = null, $insert = false)
{ {
if (is_null($shop)) if (is_null($shop))
$shop = new Shop(Configuration::get('PS_SHOP_DEFAULT')); $shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
return Db::getInstance()->execute(' if ($insert)
UPDATE `'._DB_PREFIX_.'product_shop` return Db::getInstance()->execute('
SET `id_category_default` = '.(int)$this->id_category_default.' INSERT INTO `'._DB_PREFIX_.'product_shop`
WHERE `id_shop` = '.(int)$shop->id.' VALUES ('.(int)$this->id.', '.(int)$shop->id.', '.(int)$this->id_category_default.')');
AND `id_product` = '.(int)$this->id); else
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product_shop`
SET `id_category_default` = '.(int)$this->id_category_default.'
WHERE `id_shop` = '.(int)$shop->id.'
AND `id_product` = '.(int)$this->id);
} }
} }
controllers/admin/AdminProductsController.php
+5 -1
View File
@@ -3965,6 +3965,10 @@ class AdminProductsControllerCore extends AdminController
if (!$type) if (!$type)
return; return;
if ($new_id_object)
$object = new Product($new_id_object);
else
$object = new Product($id_object);
$delete = $insert = ''; $delete = $insert = '';
foreach ($assos as $asso) foreach ($assos as $asso)
{ {
@@ -3974,7 +3978,7 @@ class AdminProductsControllerCore extends AdminController
if ($product['id_shop'] == $asso['id_'.$type]) if ($product['id_shop'] == $asso['id_'.$type])
$passed = true; $passed = true;
if (!$passed) if (!$passed)
$insert .= '('.($new_id_object ? (int)$new_id_object : (int)$asso['id_object']).', '.(int)$asso['id_'.$type].'),'; $insert .= '('.($new_id_object ? (int)$new_id_object : (int)$asso['id_object']).', '.(int)$asso['id_'.$type].', '.(int)$object->id_category_default.'),';
} }
$delete = rtrim($delete, ','); $delete = rtrim($delete, ',');
$insert = rtrim($insert, ','); $insert = rtrim($insert, ',');