From 6aed9e08ff34967238dd3b4e94ac5c3d3cece183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 1 Feb 2011 17:46:14 +0100 Subject: [PATCH] [Bug #833] Disable advance search button When doing recommended allocation it must be disabled. FEA: ItEr69S04BugFixing --- .../navalplanner/web/planner/allocation/FormBinder.java | 8 ++++++++ .../planner/allocation/ResourceAllocationController.java | 3 +++ .../taskpanels/_tabPanelNonLimitingResourceAllocation.zul | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) 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 f10a55712..026fdc122 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 @@ -174,6 +174,8 @@ public class FormBinder { private Decimalbox allResourcesPerDay; + private Button advancedSearchButton; + public FormBinder(Scenario currentScenario, AllocationRowsHandler allocationRowsHandler, IResourceAllocationModel resourceAllocationModel) { @@ -723,6 +725,7 @@ public class FormBinder { private void disableIfNeededWorkerSearch() { workerSearchTab.setDisabled(this.recommendedAllocation); newAllocationSelectorCombo.setDisabled(this.recommendedAllocation); + advancedSearchButton.setDisabled(this.recommendedAllocation); } public void setWorkerSearchTab(Tab workerSearchTab) { @@ -730,6 +733,11 @@ public class FormBinder { this.workerSearchTab.setDisabled(recommendedAllocation); } + public void setAdvancedSearchButton(Button advancedSearchButton) { + this.advancedSearchButton = advancedSearchButton; + this.advancedSearchButton.setDisabled(recommendedAllocation); + } + public void setNewAllocationSelectorCombo( NewAllocationSelectorCombo newAllocationSelectorCombo) { this.newAllocationSelectorCombo = newAllocationSelectorCombo; 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 cb70cbdaf..abc180580 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 @@ -129,6 +129,8 @@ public class ResourceAllocationController extends GenericForwardComposer { private Tab workerSearchTab; + private Button advancedSearchButton; + private Window editTaskWindow; public static void registerNeededScripts() { @@ -217,6 +219,7 @@ public class ResourceAllocationController extends GenericForwardComposer { initializeTaskInformationComponent(); initializeAllocationConfigurationComponent(); + formBinder.setAdvancedSearchButton(advancedSearchButton); CalculationTypeRadio calculationTypeRadio = CalculationTypeRadio .from(formBinder.getCalculatedValue()); diff --git a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul index cd5154a9e..b63313209 100644 --- a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul +++ b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul @@ -64,7 +64,7 @@