From e12614065caceffbc4e4ab136cf199ed2e3f3e77 Mon Sep 17 00:00:00 2001 From: vChabot Date: Fri, 11 May 2012 13:56:15 +0000 Subject: [PATCH] [-] BO : BugFix : #PSCFV-2260 : Admin in one shop can see categories from another shop --- .../themes/default/template/helpers/form/form_category.tpl | 3 ++- controllers/admin/AdminCategoriesController.php | 1 + js/admin-categories-tree.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/form/form_category.tpl b/admin-dev/themes/default/template/helpers/form/form_category.tpl index 3e7e73661..d6915f9a3 100644 --- a/admin-dev/themes/default/template/helpers/form/form_category.tpl +++ b/admin-dev/themes/default/template/helpers/form/form_category.tpl @@ -31,8 +31,9 @@ var selectedLabel = '{$categories.trads.selected}'; var home = '{$categories.trads.Root.name}'; var use_radio = {if $categories.use_radio}1{else}0{/if}; + var use_context = {if isset($categories.use_context)}1{else}0{/if}; $(document).ready(function(){ - buildTreeView(); + buildTreeView(use_context); }); diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index 1d34370a8..4944dca3a 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -359,6 +359,7 @@ class AdminCategoriesControllerCore extends AdminController 'use_search' => false, 'disabled_categories' => array(4), 'top_category' => Category::getTopCategory(), + 'use_context' => true, ) ), array( diff --git a/js/admin-categories-tree.js b/js/admin-categories-tree.js index d145a517c..6aeef54bb 100755 --- a/js/admin-categories-tree.js +++ b/js/admin-categories-tree.js @@ -36,7 +36,7 @@ var id_category_root = 0; function buildTreeView() { use_shop_context = 0; - if (buildTreeView.arguments[0]) + if (buildTreeView.arguments[0] && buildTreeView.arguments[0] == 1) use_shop_context = 1; $("#categories-treeview").treeview({ url : 'ajax.php',