diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java index cb6f1b3f8..94cfa49e6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java @@ -171,8 +171,7 @@ class FormBinder { void doApply() { lastAllocation = resourceAllocationsBeingEdited.doAllocation(); - aggregate = lastAllocation - .getAggregate(); + aggregate = lastAllocation.getAggregate(); reloadValues(); } 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 316457e81..0b5ba8dd6 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 @@ -25,10 +25,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.hibernate.Hibernate; import org.joda.time.LocalDate; import org.navalplanner.business.orders.daos.IHoursGroupDAO; import org.navalplanner.business.orders.entities.HoursGroup; import org.navalplanner.business.planner.daos.ITaskElementDAO; +import org.navalplanner.business.planner.entities.DayAssignment; import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; import org.navalplanner.business.planner.entities.Task; @@ -201,6 +203,9 @@ public class ResourceAllocationModel implements IResourceAllocationModel { if (resource.getCalendar() != null) { resource.getCalendar().getWorkableHours(new LocalDate()); } + for (DayAssignment dayAssignment : resource.getAssignments()) { + Hibernate.initialize(dayAssignment); + } } private void reattachCriterionSatisfactions(