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

[-] BO : BugFix : #PSCFV-2206 : Cannot change active or inactive for a product with multishop

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15295 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot
2012-05-15 07:51:46 +00:00
parent 0ae6eaa454
commit a2fbba7823
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/admin/AdminProductsController.php
View File

@@ -271,6 +271,10 @@ class AdminProductsControllerCore extends AdminController
$orderWay = 'ASC';
}
$alias = (Shop::getContext() != Shop::CONTEXT_SHOP) ? 'product_shop': 'sa';
$this->_select .= ', '.$alias.'.`active`';
if (!Tools::isSubmit('productFilter_active'))
$this->_filter = '';
parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, $this->context->shop->id);
/* update product quantity with attributes ...*/
@@ -2550,7 +2554,7 @@ class AdminProductsControllerCore extends AdminController
$tab_root = array('id_category' => $root->id, 'name' => $root->name);
$helper = new Helper();
$category_tree = $helper->renderCategoryTree($tab_root, $selected_cat, 'categoryBox', false, true);
$category_tree = $helper->renderCategoryTree($tab_root, $selected_cat, 'categoryBox', false, true, array(), false, true);
$data->assign(array('default_category' => $default_category,
'selected_cat_ids' => implode(',', array_keys($selected_cat)),
'selected_cat' => $selected_cat,