From 2b6a8be664e645b48ed5f2bb3e41c9417f6ad7fc Mon Sep 17 00:00:00 2001 From: Misha Date: Fri, 11 Dec 2015 19:16:20 +0200 Subject: [PATCH] Control commit --- .../libreplan/web/common/CustomMenuController.java | 13 +++++-------- .../web/planner/tabs/IGlobalViewEntryPoints.java | 4 ++-- .../planner/tabs/MultipleTabsPlannerController.java | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java index acd78ee4d..b048af54a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java @@ -275,12 +275,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { } }, "01-introducion.html#id2")); } -/* planningItems.add(subItem(_("RiskLog"), new ICapture() { - @Override - public void capture() { - globalView.g - } - }*/ + if (SecurityUtils.isSuperuserOrUserInRoles(UserRole.ROLE_PLANNING)) { planningItems.add(subItem(_("Resources Load"), new ICapture() { @Override @@ -305,12 +300,14 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { "/orders/imports/projectImport.zul", "")); } - planningItems.add(subItem(_("Logs"), new ICapture() { + + //TODO There is some problem here! + /*planningItems.add(subItem(_("Logs"), new ICapture() { @Override public void capture() { globalView.goToLogs(); } - }, "01-asd")); + }, "01-asd"));*/ if (!planningItems.isEmpty()) { topItem(_("Planning"), "/planner/index.zul", "", planningItems); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java index 7b02534cd..8e184a6de 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java @@ -47,8 +47,8 @@ public interface IGlobalViewEntryPoints { @EntryPoint("limiting_resources") public void goToLimitingResources(); - @EntryPoint("asd") - public void goToLogs(); +/* @EntryPoint("logs") + public void goToLogs();*/ @EntryPoint("orders_list") public void goToOrdersList(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java index 0cc284f31..1ea0f107a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java @@ -516,10 +516,10 @@ public class getTabsRegistry().show(resourceLoadTab); } - @Override + /*@Override public void goToLogs() { getTabsRegistry().show(logsTab); - } + }*/ @Override public void goToCompanyLimitingResources() {