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

[-] BO : #PSCFV-2562 - Select all categories on creating a new shop

Browse Source
This commit is contained in:
mDeflotte
2012-05-24 16:44:00 +00:00
parent 6a824b007d
commit 3d44e31425
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Category.php
+1 -1
View File
@@ -753,8 +753,8 @@ class CategoryCore extends ObjectModel
WHERE `id_lang` = '.(int)$id_lang.' WHERE `id_lang` = '.(int)$id_lang.'
AND c.`id_parent` = '.(int)$id_parent.' AND c.`id_parent` = '.(int)$id_parent.'
'.($active ? 'AND `active` = 1' : '').' '.($active ? 'AND `active` = 1' : '').'
GROUP BY c.`id_category`
ORDER BY category_shop.`position` ASC'; ORDER BY category_shop.`position` ASC';
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
} }
controllers/admin/AdminShopController.php
+6 -4
View File
@@ -601,11 +601,13 @@ class AdminShopControllerCore extends AdminController
if (empty($selected_cat)) if (empty($selected_cat))
{ {
// get first category root and preselect all these children // get first category root and preselect all these children
$root_category = Category::getRootCategories(); $root_categories = Category::getRootCategories();
$children = Category::getChildren($root_category[0]['id_category'], $this->context->language->id); $root_category = new Category($root_categories[0]['id_category']);
$selected_cat[] = $root_category[0]['id_category']; $children = $root_category->getAllChildren($this->context->language->id);
$selected_cat[] = $root_categories[0]['id_category'];
foreach ($children as $child) foreach ($children as $child)
$selected_cat[] = $child['id_category']; $selected_cat[] = $child->id_category;
} }
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);