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 b45be80e7..cb6f1b3f8 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 @@ -169,7 +169,7 @@ class FormBinder { this.taskElapsedDays.setDisabled(true); } - private void doApply() { + void doApply() { lastAllocation = resourceAllocationsBeingEdited.doAllocation(); aggregate = lastAllocation .getAggregate(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java index 8e6718cab..c6a225862 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java @@ -332,6 +332,10 @@ public class ResourceAllocationController extends GenericForwardComposer { public void advanceAllocation() { AllocationResult allocationResult = formBinder.getLastAllocation(); + if (allocationResult.getAggregate().isEmpty()) { + formBinder.doApply(); + allocationResult = formBinder.getLastAllocation(); + } switcher.goToAdvancedAllocation(allocationResult, createResultReceiver(allocationResult)); window.setVisible(false);