diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index 6b1dcffdc..b4b740662 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -760,4 +760,9 @@ public abstract class AllocationRow { }); } + public boolean isNotFlat() { + return getOrigin() != null + && getOrigin().getAssignmentFunction() != null; + } + } 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 0657245e2..94a037531 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 @@ -906,4 +906,14 @@ public class FormBinder { this.behaviour = behaviour; } + public boolean isAnyNotFlat() { + for (AllocationRow allocationRow : allocationRowsHandler + .getCurrentRows()) { + if (allocationRow.isNotFlat()) { + return true; + } + } + return false; + } + } 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 bd4b8672a..06590dd0b 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 @@ -720,19 +720,7 @@ public class ResourceAllocationController extends GenericForwardComposer { } public boolean isAnyNotFlat() { - if (formBinder == null) { - return false; - } - - List currentRows = formBinder.getCurrentRows(); - for (AllocationRow allocationRow : currentRows) { - if ((allocationRow.getOrigin() != null) - && (allocationRow.getOrigin().getAssignmentFunction() != null)) { - return true; - } - } - - return false; + return formBinder != null && formBinder.isAnyNotFlat(); } }