Index: src/main/java/info/magnolia/module/data/trees/GenericDataAdminTreeConfig.java =================================================================== --- src/main/java/info/magnolia/module/data/trees/GenericDataAdminTreeConfig.java (revision 17063) +++ src/main/java/info/magnolia/module/data/trees/GenericDataAdminTreeConfig.java (working copy) @@ -214,6 +214,9 @@ + ",'" + this.getItemType() + "')"); + menuNew.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); //$NON-NLS-1$ ContextMenuItem menuNewFolder = new ContextMenuItem("newFolder"); menuNewFolder.setLabel(msgs.get("module.data.tree.data.menu.newFolder")); @@ -224,6 +227,9 @@ + ",'" + this.getItemType() + "')"); + menuNewFolder.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); //$NON-NLS-1$ ContextMenuItem menuEdit = new ContextMenuItem("edit"); menuEdit.setLabel(msgs.get("module.data.tree.data.menu.edit")); @@ -232,6 +238,9 @@ menuEdit.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedItemType(" //$NON-NLS-1$ + tree.getJavascriptTree() + ", '" + this.getItemType() + "')"); //$NON-NLS-1$ + menuEdit.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); //$NON-NLS-1$ ContextMenuItem menuDelete = new ContextMenuItem("delete"); menuDelete.setLabel(msgs.get("tree.config.menu.delete")); @@ -240,6 +249,9 @@ menuDelete.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" + tree.getJavascriptTree() + ")"); + menuDelete.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); //$NON-NLS-1$ ContextMenuItem menuCopy = new ContextMenuItem("copy"); menuCopy.setLabel(msgs.get("tree.config.menu.copy")); @@ -261,6 +273,9 @@ + tree.getJavascriptTree() + ")"); menuCut.setOnclick(tree.getJavascriptTree() + ".cutNode();"); + menuCut.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); //$NON-NLS-1$ ContextMenuItem menuActivateExcl = new ContextMenuItem("activate"); menuActivateExcl.setLabel(msgs.get("tree.config.menu.activate")); //$NON-NLS-1$ @@ -272,6 +287,9 @@ menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$ + tree.getJavascriptTree() + ")"); //$NON-NLS-1$ + menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); //$NON-NLS-1$ ContextMenuItem menuActivateIncl = new ContextMenuItem("activateInclSubs"); menuActivateIncl.setLabel(msgs.get("tree.web.menu.activateInclSubs")); //$NON-NLS-1$ @@ -298,6 +316,9 @@ menuDeActivate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$ + tree.getJavascriptTree() + ")"); //$NON-NLS-1$ + menuDeActivate.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); //$NON-NLS-1$ if (!hasAnyActiveSubscriber()) { menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionBoolean(false)"); //$NON-NLS-1$ @@ -310,6 +331,9 @@ menuExport.setIcon(request.getContextPath() + "/.resources/icons/16/export1.gif"); //$NON-NLS-1$ // keep versions menuExport.setOnclick(tree.getJavascriptTree() + ".exportNode(true);"); //$NON-NLS-1$ + menuExport.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); ContextMenuItem menuImport = new ContextMenuItem(); menuImport.setLabel(msgs.get("tree.menu.import")); //$NON-NLS-1$ @@ -315,6 +339,9 @@ menuImport.setLabel(msgs.get("tree.menu.import")); //$NON-NLS-1$ menuImport.setIcon(request.getContextPath() + "/.resources/icons/16/import2.gif"); //$NON-NLS-1$ menuImport.setOnclick(tree.getJavascriptTree() + ".importNode(this);"); //$NON-NLS-1$ + menuImport.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); ContextMenuItem menuRefresh = new ContextMenuItem(); menuRefresh.setLabel(msgs.get("tree.menu.refresh")); @@ -366,6 +393,9 @@ menuDeleteAll.setLabel(msgs.get("module.data.tree.data.menu.deleteAll")); menuDeleteAll.setIcon(request.getContextPath() + "/.resources/icons/16/delete2.gif"); menuDeleteAll.setOnclick("mgnl.data.DataTree.deleteAll(" + tree.getJavascriptTree() + ");"); + menuDeleteAll.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); ContextMenuItem menuActivateAll = new FunctionBarItem("activateAll"); menuActivateAll.setLabel(msgs.get("module.data.tree.data.menu.activateAll")); @@ -371,6 +401,9 @@ menuActivateAll.setLabel(msgs.get("module.data.tree.data.menu.activateAll")); menuActivateAll.setIcon(request.getContextPath() + "/.resources/icons/16/arrow_right_green.gif"); menuActivateAll.setOnclick("mgnl.data.DataTree.activateAll(" + tree.getJavascriptTree() + ");"); + menuActivateAll.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); ContextMenuItem menuDeactivateAll = new FunctionBarItem("deactivateAll"); menuDeactivateAll.setLabel(msgs.get("module.data.tree.data.menu.deactivateAll")); @@ -376,6 +409,9 @@ menuDeactivateAll.setLabel(msgs.get("module.data.tree.data.menu.deactivateAll")); menuDeactivateAll.setIcon(request.getContextPath() + "/.resources/icons/16/arrow_left_red.gif"); menuDeactivateAll.setOnclick("mgnl.data.DataTree.deactivateAll(" + tree.getJavascriptTree() + ");"); + menuDeactivateAll.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ")"); if (!hasAnyActiveSubscriber()) { menuActivateAll.addJavascriptCondition("new mgnlTreeMenuItemConditionBoolean(false)"); //$NON-NLS-1$