From 8db14ca4071d8afc3935edd90e917b702d78dbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 23 Feb 2010 19:39:58 +0100 Subject: [PATCH] ItEr49S10CUVisualizacionResponsabilidadesTRaballoNaPlanificacionItEr48S10: Loading unsatisfied allocations too at allocation form --- .../web/planner/allocation/ResourceAllocationModel.java | 2 +- .../org/navalplanner/web/planner/order/OrderPlanningModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java index 3d7c0f772..a8d545bbb 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java @@ -248,7 +248,7 @@ public class ResourceAllocationModel implements IResourceAllocationModel { loadResources(this.task.getSatisfiedResourceAllocations()); loadDerivedAllocations(this.task.getSatisfiedResourceAllocations()); List initialRows = AllocationRow.toRows(this.task - .getSatisfiedResourceAllocations()); + .getAllResourceAllocations()); allocationRowsHandler = AllocationRowsHandler.create(task, initialRows, createWorkerFinder()); return allocationRowsHandler; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 53bc43686..9017244e9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -860,7 +860,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { private static void forceLoadOfResourceAllocationsResources( TaskElement taskElement) { Set> resourceAllocations = taskElement - .getSatisfiedResourceAllocations(); + .getAllResourceAllocations(); for (ResourceAllocation each : resourceAllocations) { each.getAssociatedResources(); for (DerivedAllocation eachDerived : each.getDerivedAllocations()) {