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

ItEr51S04ValidacionEProbasFuncionaisItEr50S04: Avoiding repeated load of data for OrderPlanningModel.

Browse source
This commit is contained in:
Óscar González Fernández 2010-03-18 16:11:30 +01:00
parent 2ce50f4713
commit 8bc5b9f7e9
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
View file

@ -130,9 +130,6 @@ public class OrderPlanningController implements Composer {
@Override
public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
if (order == null) {
throw new IllegalStateException("an order should have been set");
}
this.planner = (Planner) comp;
String zoomLevelParameter = null;
if ((parameters != null) && (parameters.get("zoom") != null)
@ -166,9 +163,12 @@ public class OrderPlanningController implements Composer {
}
private void updateConfiguration() {
model.setConfigurationToPlanner(planner, order, viewSwitcher,
editTaskController, calendarAllocationController, additional);
planner.updateSelectedZoomLevel();
if (order != null) {
model.setConfigurationToPlanner(planner, order, viewSwitcher,
editTaskController, calendarAllocationController,
additional);
planner.updateSelectedZoomLevel();
}
}
public EditTaskController getEditTaskController() {

1
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
View file

@ -175,7 +175,6 @@ public class PlanningTabCreator {
public org.zkoss.zk.ui.Component create(
org.zkoss.zk.ui.Component parent) {
Map<String, Object> arguments = new HashMap<String, Object>();
orderPlanningController.setOrder(mode.getOrder());
arguments.put("orderPlanningController",
orderPlanningController);
orderPlanningController.setURLParameters(parameters);