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

//small fix

Browse Source
This commit is contained in:
vAugagneur
2012-08-06 14:47:52 +00:00
parent d1b78cbba0
commit f5ca25cfc8
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+6 -1
View File
@@ -4829,12 +4829,17 @@ class ProductCore extends ObjectModel
*/ */
public function getDefaultCategory() public function getDefaultCategory()
{ {
return Db::getInstance()->getValue(' $default_category = Db::getInstance()->getValue('
SELECT product_shop.`id_category_default` SELECT product_shop.`id_category_default`
FROM `'._DB_PREFIX_.'product` p FROM `'._DB_PREFIX_.'product` p
'.Shop::addSqlAssociation('product', 'p').' '.Shop::addSqlAssociation('product', 'p').'
WHERE p.`id_product` = '.(int)$this->id); WHERE p.`id_product` = '.(int)$this->id);
if (!$default_category)
return array('id_category_default' => Context::getContext()->shop->id_category);
else
return $default_category;
} }
public static function getShopsByProduct($id_product) public static function getShopsByProduct($id_product)
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2605,7 +2605,7 @@ class AdminProductsControllerCore extends AdminController
$data = $this->createTemplate($this->tpl_form); $data = $this->createTemplate($this->tpl_form);
// Prepare Categories tree for display in Associations tab // Prepare Categories tree for display in Associations tab
$root = Category::getRootCategory(); $root = Category::getRootCategory();
$default_category = Tools::getValue('id_category', Configuration::get('PS_HOME_CATEGORY')); $default_category = Tools::getValue('id_category', Context::getContext()->shop->id_category);
if (!$product->id) if (!$product->id)
$selected_cat = Category::getCategoryInformations(Tools::getValue('categoryBox', array($default_category)), $this->default_form_language); $selected_cat = Category::getCategoryInformations(Tools::getValue('categoryBox', array($default_category)), $this->default_form_language);