[-] BO : BugFix : #PSCFV-2260 : Admin in one shop can see categories from another shop

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);
 		});
 	</script>
 

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(

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',