From e71b057c0d7a0a2e81f503adef1a71e9489ee97d Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 1 Sep 2011 08:22:29 +0200 Subject: [PATCH] Enable again resource allocation inputs for any assignment function This reverts changes done in commit 0053c5e5d2a44d393331551c4bf6ef846e96ceac FEA: ItEr75S23FixAllocationModel --- .../navalplanner/web/planner/allocation/AllocationRow.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 d7c5797b6..5f9bb80a5 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 @@ -504,13 +504,11 @@ public abstract class AllocationRow { this.currentCalculatedValue = calculatedValue; effortInput .setDisabled(calculatedValue != CalculatedValue.RESOURCES_PER_DAY - || recommendedAllocation - || isAssignmentFunctionNotFlat()); + || recommendedAllocation); effortInput.setConstraint(constraintForHoursInput()); intendedResourcesPerDayInput .setDisabled(calculatedValue == CalculatedValue.RESOURCES_PER_DAY - || recommendedAllocation - || isAssignmentFunctionNotFlat()); + || recommendedAllocation); if (intendedResourcesPerDayInput.isDisabled()) { clearRealResourcesPerDay(); }