From 90d61a0bb5eb99685898ddee7c4822e916096d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 3 Mar 2010 21:27:03 +0100 Subject: [PATCH] ItEr49S04ValidacionEProbasFuncionaisItEr48S04: [Bug #367] Fixing bug. Using OrderPlanningModel's loadRequiredData in order to load resources required data. --- .../web/planner/tabs/AdvancedAllocationTabCreator.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java index 965a942cc..b72343071 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java @@ -31,7 +31,6 @@ import java.util.Set; import org.apache.commons.lang.Validate; import org.hibernate.Hibernate; import org.joda.time.LocalDate; -import org.navalplanner.business.calendars.entities.ResourceCalendar; import org.navalplanner.business.common.IAdHocTransactionService; import org.navalplanner.business.common.IOnTransaction; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; @@ -54,6 +53,7 @@ import org.navalplanner.web.planner.allocation.AdvancedAllocationController.IAdv import org.navalplanner.web.planner.allocation.AdvancedAllocationController.IBack; import org.navalplanner.web.planner.allocation.AdvancedAllocationController.Restriction; import org.navalplanner.web.planner.allocation.AdvancedAllocationController.Restriction.IRestrictionSource; +import org.navalplanner.web.planner.order.OrderPlanningModel; import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator; import org.zkoss.ganttz.extensions.ITab; import org.zkoss.zk.ui.Component; @@ -154,10 +154,9 @@ public class AdvancedAllocationTabCreator { private void reattachResources() { for (Resource each : associatedResources) { resourceDAO.reattach(each); - ResourceCalendar calendar = each.getCalendar(); - if (calendar != null) { - BaseCalendarModel.forceLoadBaseCalendar(calendar); - } + } + OrderPlanningModel.loadRequiredDataFor(associatedResources); + for (Resource each : associatedResources) { loadDayAssignments(each.getAssignments()); } }