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

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

Browse Source
This commit is contained in:
vChabot
2012-05-11 13:56:15 +00:00
parent dc0ba0b452
commit e12614065c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/form/form_category.tpl
+2 -1
View File
@@ -31,8 +31,9 @@
var selectedLabel = '{$categories.trads.selected}'; var selectedLabel = '{$categories.trads.selected}';
var home = '{$categories.trads.Root.name}'; var home = '{$categories.trads.Root.name}';
var use_radio = {if $categories.use_radio}1{else}0{/if}; 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(){ $(document).ready(function(){
buildTreeView(); buildTreeView(use_context);
}); });
</script> </script>
controllers/admin/AdminCategoriesController.php
+1
View File
@@ -359,6 +359,7 @@ class AdminCategoriesControllerCore extends AdminController
'use_search' => false, 'use_search' => false,
'disabled_categories' => array(4), 'disabled_categories' => array(4),
'top_category' => Category::getTopCategory(), 'top_category' => Category::getTopCategory(),
'use_context' => true,
) )
), ),
array( array(
js/admin-categories-tree.js
+1 -1
View File
@@ -36,7 +36,7 @@ var id_category_root = 0;
function buildTreeView() function buildTreeView()
{ {
use_shop_context = 0; use_shop_context = 0;
if (buildTreeView.arguments[0]) if (buildTreeView.arguments[0] && buildTreeView.arguments[0] == 1)
use_shop_context = 1; use_shop_context = 1;
$("#categories-treeview").treeview({ $("#categories-treeview").treeview({
url : 'ajax.php', url : 'ajax.php',