From 519eb1e28f741568fc79d1c4d1329762586bb73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 7 Dec 2009 18:52:59 +0100 Subject: [PATCH] ItEr38S05ValidacionEProbasFuncionaisItEr37S06: Fixing potential problem. Reattaching TaskSource too. --- .../navalplanner/web/resourceload/ResourceLoadModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java index 96ecdc203..fa4a2a54a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java @@ -37,6 +37,7 @@ import java.util.Map.Entry; import org.navalplanner.business.orders.daos.IOrderDAO; import org.navalplanner.business.orders.entities.Order; import org.navalplanner.business.planner.daos.IResourceAllocationDAO; +import org.navalplanner.business.planner.daos.ITaskSourceDAO; import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; @@ -65,6 +66,9 @@ public class ResourceLoadModel implements IResourceLoadModel { @Autowired private IOrderDAO orderDAO; + @Autowired + private ITaskSourceDAO taskSourceDAO; + @Autowired private IResourceAllocationDAO resourceAllocationDAO; @@ -85,6 +89,9 @@ public class ResourceLoadModel implements IResourceLoadModel { public void initGlobalView(Order filterBy) { this.filterBy = filterBy; orderDAO.reattach(filterBy); + if (filterBy.getTaskSource() != null) { + taskSourceDAO.reattach(filterBy.getTaskSource()); + } doGlobalView(); }