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

[-] BO : BugFix : #PSTEST-773 : category restriction with shop context

Browse Source 
// category id fix
This commit is contained in:
vChabot
2012-02-29 10:19:00 +00:00
parent 3c9c564183
commit fba74aecea
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCategoriesController.php
+12 -6
View File
@@ -80,10 +80,6 @@ class AdminCategoriesControllerCore extends AdminController
) )
); );
// if we are not in a shop context, we remove the position column
if (Shop::getContext() != Shop::CONTEXT_SHOP)
unset($this->fieldsDisplay['position']);
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'))); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected')));
$this->specificConfirmDelete = false; $this->specificConfirmDelete = false;
@@ -103,7 +99,17 @@ class AdminCategoriesControllerCore extends AdminController
else if (count(Category::getCategoriesWithoutParent()) > 1) else if (count(Category::getCategoriesWithoutParent()) > 1)
$this->_category = Category::getTopCategory(); $this->_category = Category::getTopCategory();
else else
$this->_category = new Category(2); $this->_category = new Category(Configuration::get('PS_HOME_CATEGORY'));
// if we are not in a shop context, we remove the position column
if (Shop::getContext() != Shop::CONTEXT_SHOP)
unset($this->fieldsDisplay['position']);
// shop restriction : if category is not available for current shop, we redirect to the list from default category
if (!Shop::isCategoryAvailable($this->_category->id))
{
$this->redirect_after = self::$currentIndex.'&id_category='.(int)$this->context->shop->getCategory().'&token='.$this->token;
$this->redirect();
}
} }
public function initContent() public function initContent()
@@ -140,7 +146,7 @@ class AdminCategoriesControllerCore extends AdminController
else if (!$is_multishop && $count_categories_without_parent > 1) else if (!$is_multishop && $count_categories_without_parent > 1)
$id_parent = $top_category->id; $id_parent = $top_category->id;
else if ($is_multishop && $count_categories_without_parent == 1) else if ($is_multishop && $count_categories_without_parent == 1)
$id_parent = 2; //TODO need to get the ID category where category = Home $id_parent = Configuration::get('PS_HOME_CATEGORY');
else if ($is_multishop && $count_categories_without_parent > 1 && Shop::getContext() != Shop::CONTEXT_SHOP) else if ($is_multishop && $count_categories_without_parent > 1 && Shop::getContext() != Shop::CONTEXT_SHOP)
$id_parent = $top_category->id; $id_parent = $top_category->id;
else else