From 8af4932e5a78bef4e2b59214d84d2820274dd9f9 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 5 Oct 2011 08:38:04 +0200
Subject: [PATCH] Disable inputs in AllocationRow if there is any manual
 allocation

FEA: ItEr75S23FixAllocationModel
---
 .../web/planner/allocation/AllocationRow.java          | 10 +++-------
 .../web/planner/allocation/FormBinder.java             |  3 ++-
 2 files changed, 5 insertions(+), 8 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 220a1b40e..2cf9def70 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
@@ -500,17 +500,13 @@ public abstract class AllocationRow {
     }
 
     public void applyDisabledRules(CalculatedValue calculatedValue,
-            boolean recommendedAllocation) {
+            boolean recommendedAllocation, boolean isAnyManual) {
         this.currentCalculatedValue = calculatedValue;
         effortInput
-                .setDisabled(calculatedValue != CalculatedValue.RESOURCES_PER_DAY
-                        || recommendedAllocation
-                        || isAssignmentFunctionManual());
+                .setDisabled(calculatedValue !=CalculatedValue.RESOURCES_PER_DAY                        || recommendedAllocation || isAnyManual);
         effortInput.setConstraint(constraintForHoursInput());
         intendedResourcesPerDayInput
-                .setDisabled(calculatedValue == CalculatedValue.RESOURCES_PER_DAY
-                        || recommendedAllocation
-                        || isAssignmentFunctionManual());
+                .setDisabled(calculatedValue == CalculatedValue.RESOURCES_PER_DAY                        || recommendedAllocation || isAnyManual);
         if (intendedResourcesPerDayInput.isDisabled()) {
             clearRealResourcesPerDay();
         }
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 2870f0417..72d937c4d 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
@@ -249,7 +249,8 @@ public class FormBinder {
 
     private void applyDisabledRulesOnRows() {
         for (AllocationRow each : rows) {
-            each.applyDisabledRules(getCalculatedValue(), recommendedAllocation);
+            each.applyDisabledRules(getCalculatedValue(),
+                    recommendedAllocation, isAnyManual());
         }
     }