RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Control commit

Browse source
This commit is contained in:
Misha 2015-12-11 19:16:20 +02:00
parent 26f31afaf8
commit 2b6a8be664
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
View file

@ -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);

4
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java
View file

@ -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();

4
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
View file

@ -516,10 +516,10 @@ public class
getTabsRegistry().show(resourceLoadTab);
}
@Override
/*@Override
public void goToLogs() {
getTabsRegistry().show(logsTab);
}
}*/
@Override
public void goToCompanyLimitingResources() {