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

[-] BO: Fix various bugs in categories ntree generation

Browse Source
This commit is contained in:
Rémi Gaillard
2012-12-11 11:19:21 +01:00
parent ecac947c2e
commit b2f01058a8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Category.php
+4 -4
View File
@@ -210,7 +210,7 @@ class CategoryCore extends ObjectModel
if (!isset($this->doNotRegenerateNTree) || !$this->doNotRegenerateNTree) if (!isset($this->doNotRegenerateNTree) || !$this->doNotRegenerateNTree)
{ {
Category::regenerateEntireNtree(); Category::regenerateEntireNtree();
$this->recalculateLevelDepth($this->id_category); $this->recalculateLevelDepth($this->id);
} }
Hook::exec('actionCategoryUpdate', array('category' => $this)); Hook::exec('actionCategoryUpdate', array('category' => $this));
return $ret; return $ret;
@@ -264,7 +264,7 @@ class CategoryCore extends ObjectModel
$this->description = Category::getDescriptionClean($this->description); $this->description = Category::getDescriptionClean($this->description);
return array( return array(
'id' => (int)$this->id_category, 'id' => (int)$this->id,
'link' => Context::getContext()->link->getCategoryLink($this->id, $this->link_rewrite), 'link' => Context::getContext()->link->getCategoryLink($this->id, $this->link_rewrite),
'name' => $this->name, 'name' => $this->name,
'desc'=> $this->description, 'desc'=> $this->description,
@@ -964,8 +964,8 @@ class CategoryCore extends ObjectModel
$root_category = Category::getRootCategory(); $root_category = Category::getRootCategory();
if (Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP && if (Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP &&
(!Tools::isSubmit('id_category') || (!Tools::isSubmit('id_category') ||
(int)Tools::getValue('id_category') == (int)$root_category->id_category || (int)Tools::getValue('id_category') == (int)$root_category->id ||
(int)$root_category->id_category == (int)$context->shop->id_category)) (int)$root_category->id == (int)$context->shop->id_category))
$sql .= ' $sql .= '
AND c.`id_parent` != 0'; AND c.`id_parent` != 0';
classes/Configuration.php
+2 -2
View File
@@ -323,7 +323,7 @@ class ConfigurationCore extends ObjectModel
$result &= Db::getInstance()->update('configuration', array( $result &= Db::getInstance()->update('configuration', array(
'value' => pSQL($value, $html), 'value' => pSQL($value, $html),
'date_upd' => date('Y-m-d H:i:s'), 'date_upd' => date('Y-m-d H:i:s'),
), '`name` = \''.pSQL($key).'\''.Configuration::sqlRestriction($id_shop_group, $id_shop), true, true); ), '`name` = \''.pSQL($key).'\''.Configuration::sqlRestriction($id_shop_group, $id_shop), 1, true);
} }
else else
{ {
@@ -504,7 +504,7 @@ class ConfigurationCore extends ObjectModel
{ {
if ($id_shop) if ($id_shop)
return ' AND id_shop = '.(int)$id_shop; return ' AND id_shop = '.(int)$id_shop;
else if ($id_shop_group) elseif ($id_shop_group)
return ' AND id_shop_group = '.(int)$id_shop_group.' AND id_shop IS NULL'; return ' AND id_shop_group = '.(int)$id_shop_group.' AND id_shop IS NULL';
else else
return ' AND id_shop_group IS NULL AND id_shop IS NULL'; return ' AND id_shop_group IS NULL AND id_shop IS NULL';
controllers/admin/AdminCategoriesController.php
+2 -2
View File
@@ -177,7 +177,7 @@ class AdminCategoriesControllerCore extends AdminController
$categories_tree = $this->_category->getParentsCategories(); $categories_tree = $this->_category->getParentsCategories();
if (empty($categories_tree) if (empty($categories_tree)
&& ($this->_category->id_category != 1 || Tools::isSubmit('id_category')) && ($this->_category->id != 1 || Tools::isSubmit('id_category'))
&& (Shop::getContext() == Shop::CONTEXT_SHOP && !$is_multishop && $count_categories_without_parent > 1)) && (Shop::getContext() == Shop::CONTEXT_SHOP && !$is_multishop && $count_categories_without_parent > 1))
$categories_tree = array(array('name' => $this->_category->name[$this->context->language->id])); $categories_tree = array(array('name' => $this->_category->name[$this->context->language->id]));
@@ -322,7 +322,7 @@ class AdminCategoriesControllerCore extends AdminController
$guest_group_information = sprintf($this->l('%s - Customer who placed an order with the Guest Checkout.'), '<b>'.$guest->name[$this->context->language->id].'</b>'); $guest_group_information = sprintf($this->l('%s - Customer who placed an order with the Guest Checkout.'), '<b>'.$guest->name[$this->context->language->id].'</b>');
$default_group_information = sprintf($this->l('%s - All people who have created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>'); $default_group_information = sprintf($this->l('%s - All people who have created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>');
$root_category = Category::getRootCategory(); $root_category = Category::getRootCategory();
$root_category = array('id_category' => $root_category->id_category, 'name' => $root_category->name); $root_category = array('id_category' => $root_category->id, 'name' => $root_category->name);
$this->fields_form = array( $this->fields_form = array(
'tinymce' => true, 'tinymce' => true,
'legend' => array( 'legend' => array(
controllers/admin/AdminShopController.php
+2 -2
View File
@@ -196,7 +196,7 @@ class AdminShopControllerCore extends AdminController
{ {
$root_category = new Category((int)Tools::getValue('id_category')); $root_category = new Category((int)Tools::getValue('id_category'));
$root_category = array( $root_category = array(
'id_category' => $root_category->id_category, 'id_category' => $root_category->id,
'name' => $root_category->name[$this->context->language->id] 'name' => $root_category->name[$this->context->language->id]
); );
$selected_cat = array($root_category['id_category']); $selected_cat = array($root_category['id_category']);
@@ -629,7 +629,7 @@ class AdminShopControllerCore extends AdminController
$selected_cat[] = $root_categories[0]['id_category']; $selected_cat[] = $root_categories[0]['id_category'];
foreach ($children as $child) foreach ($children as $child)
$selected_cat[] = $child->id_category; $selected_cat[] = $child->id;
} }
if (Shop::getContext() == Shop::CONTEXT_SHOP && Tools::isSubmit('id_shop')) if (Shop::getContext() == Shop::CONTEXT_SHOP && Tools::isSubmit('id_shop'))
$root_category = new Category($shop->id_category); $root_category = new Category($shop->id_category);