From c66dfdf61689fad1fc81106a753008e25be6a8fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 8 Dec 2009 16:46:02 +0100
Subject: [PATCH] ItEr38S05ValidacionEProbasFuncionaisItEr37S06: [Bug #147]
 Fixing bug. The problem was caused by the existence of different instances of
 the same resource.

---
 .../web/resourceload/ResourceLoadModel.java         | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

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 fa4a2a54a..2fc5eb0cb 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
@@ -87,11 +87,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
     @Override
     @Transactional(readOnly = true)
     public void initGlobalView(Order filterBy) {
-        this.filterBy = filterBy;
-        orderDAO.reattach(filterBy);
-        if (filterBy.getTaskSource() != null) {
-            taskSourceDAO.reattach(filterBy.getTaskSource());
-        }
+        this.filterBy = orderDAO.findExistingEntity(filterBy.getId());
         doGlobalView();
     }
 
@@ -122,7 +118,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
         if (filter()) {
             return resourceAllocationDAO
                     .findGenericAllocationsByCriterionFor(justTasks(filterBy
-                            .getAssociatedTasks()));
+                            .getAllChildrenAssociatedTaskElements()));
         } else {
             return resourceAllocationDAO.findGenericAllocationsByCriterion();
 
@@ -142,8 +138,9 @@ public class ResourceLoadModel implements IResourceLoadModel {
     }
 
     private List<Resource> resourcesForActiveTasks() {
-        return resourcesDAO.findResourcesRelatedTo(justTasks(filterBy
-                .getAssociatedTasks()));
+        return resourcesDAO
+                .findResourcesRelatedTo(justTasks(filterBy
+                .getAllChildrenAssociatedTaskElements()));
     }
 
     private List<Task> justTasks(Collection<? extends TaskElement> tasks) {