RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr38S05ValidacionEProbasFuncionaisItEr37S06: [Bug #147] Fixing bug. The problem was caused by the existence of different instances of the same resource.

Browse source
This commit is contained in:
Óscar González Fernández 2009-12-08 16:46:02 +01:00
parent 46fded8b0d
commit c66dfdf616
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -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) {