From de3adddecc8250b7658287a6edef1082df1cc9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 10 Feb 2010 10:46:39 +0100 Subject: [PATCH] ItEr47S04ValidacionEProbasFuncionaisItEr46S04: [Bug #277] Fixing bug. The task's calendar was not being forced to be loaded. --- .../navalplanner/web/planner/order/OrderPlanningModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index cfae2cb18..bccdb6653 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -72,6 +72,7 @@ import org.navalplanner.business.users.entities.User; import org.navalplanner.business.users.entities.UserRole; import org.navalplanner.business.workreports.daos.IWorkReportLineDAO; import org.navalplanner.business.workreports.entities.WorkReportLine; +import org.navalplanner.web.calendars.BaseCalendarModel; import org.navalplanner.web.common.ViewSwitcher; import org.navalplanner.web.planner.ITaskElementAdapter; import org.navalplanner.web.planner.ITaskElementAdapter.IOnMoveListener; @@ -766,6 +767,9 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { for (TaskElement each : initial) { forceLoadOfResourceAllocationsResources(each); forceLoadOfCriterions(each); + if (each.getCalendar() != null) { + BaseCalendarModel.forceLoadBaseCalendar(each.getCalendar()); + } if (each instanceof TaskGroup) { findChildrenWithQueryToAvoidProxies((TaskGroup) each); List children = each.getChildren();