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

Removed 'Up' command in resources load view of a project

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2011-10-20 22:58:35 +02:00
parent 503fe6d993
commit 24bb2cf581
3 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
View file

@ -30,8 +30,8 @@ resourcesLoadPanel = self;
<borderlayout sclass="resourcesloadlayout" width="auto" height="100%">
<north height="30px" border="0" sclass="toolbar-box">
<hbox align="center" id="toolbar">
<separator/>
<hbox align="center" id="toolbar" >
<separator height="30px"/>
<label>${ganttzk_i18n:_('Zoom')}:</label>
<listbox id="listZoomLevels" mold="select" rows="1"
model="${resourcesLoadPanel.zoomLevels}"

22
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
View file

@ -198,7 +198,7 @@ public class MultipleTabsPlannerController implements Composer,
breadcrumbs, parameters, this));
resourceLoadTab = ResourcesLoadTabCreator.create(mode,
resourceLoadController, upCommand(),
resourceLoadController,
resourceLoadControllerGlobal, new IOrderPlanningGate() {
@Override
@ -371,26 +371,6 @@ public class MultipleTabsPlannerController implements Composer,
return tabsSwitcher.getTabsRegistry();
}
private IToolbarCommand upCommand() {
return new IToolbarCommand() {
@Override
public void doAction() {
mode.up();
}
@Override
public String getLabel() {
return _("Up to company view");
}
@Override
public String getImage() {
return "/common/img/ico_up.png";
}
};
}
@Override
public void goToCompanyScheduling() {
getTabsRegistry().show(planningTab);

7
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
View file

@ -48,12 +48,11 @@ public class ResourcesLoadTabCreator {
public static ITab create(Mode mode,
ResourceLoadController resourceLoadController,
IToolbarCommand upCommand,
ResourceLoadController resourceLoadControllerGlobal,
IOrderPlanningGate orderPlanningGate,
Component breadcrumbs) {
return new ResourcesLoadTabCreator(mode, resourceLoadController,
upCommand, resourceLoadControllerGlobal, orderPlanningGate,
resourceLoadControllerGlobal, orderPlanningGate,
breadcrumbs)
.build();
}
@ -63,18 +62,15 @@ public class ResourcesLoadTabCreator {
private final ResourceLoadController resourceLoadControllerGlobal;
private final IToolbarCommand upCommand;
private final Component breadcrumbs;
private ResourcesLoadTabCreator(Mode mode,
ResourceLoadController resourceLoadController,
IToolbarCommand upCommand,
ResourceLoadController resourceLoadControllerGlobal,
IOrderPlanningGate orderPlanningGate,
Component breadcrumbs) {
this.mode = mode;
this.resourceLoadController = resourceLoadController;
this.upCommand = upCommand;
this.resourceLoadControllerGlobal = resourceLoadControllerGlobal;
this.orderPlanningGate = orderPlanningGate;
this.breadcrumbs = breadcrumbs;
@ -94,7 +90,6 @@ public class ResourcesLoadTabCreator {
public org.zkoss.zk.ui.Component create(
org.zkoss.zk.ui.Component parent) {
Map<String, Object> arguments = new HashMap<String, Object>();
resourceLoadController.add(upCommand);
arguments.put("resourceLoadController", resourceLoadController);
return Executions.createComponents(
"/resourceload/_resourceloadfororder.zul", parent,