From d3892ef7782adaf66084b75aa2c4cb353709b60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 28 Sep 2010 00:00:27 +0200 Subject: [PATCH] Prevent going to advance allocation when there are no allocations FEA: ItEr61S05BugFixing --- .../web/planner/taskedition/EditTaskController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java index 4800c9a51..4e47682cf 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java @@ -24,6 +24,7 @@ import static org.navalplanner.web.I18nHelper._; import java.util.Date; +import org.apache.commons.lang.Validate; import org.joda.time.LocalDate; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.planner.entities.AggregateOfResourceAllocations; @@ -363,6 +364,11 @@ public class EditTaskController extends GenericForwardComposer { formBinder.doApply(); allocationResult = formBinder.getLastAllocation(); } + if (allocationResult.getAggregate().isEmpty()) { + getMessagesForUser().showMessage(Level.WARNING, + _("Some allocations needed")); + return; + } getSwitcher().goToAdvancedAllocation( allocationResult, createResultReceiver(allocationResult)); window.setVisible(false); @@ -388,6 +394,7 @@ public class EditTaskController extends GenericForwardComposer { private final IRestrictionSource restrictionSource; private AdvanceAllocationResultReceiver(AllocationResult allocation) { + Validate.isTrue(!allocation.getAggregate().isEmpty()); this.allocation = allocation; final int totalHours = allocation.getAggregate().getTotalHours(); final IntraDayDate start = allocation.getIntraDayStart();