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(); }