From 0decbb958a64685a84cdea4470bb92a93a20489e Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Thu, 20 Jan 2011 18:29:41 +0100
Subject: [PATCH] Fix bug in 'Worker search' screen, close button was not
 working for limiting resources

FEA: ItEr68S04BugFixing
---
 .../allocation/LimitingResourceAllocationController.java | 9 +++++----
 .../taskpanels/_tabPanelLimitingResourceAllocation.zul   | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
index 3353485f5..88119e821 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
@@ -36,6 +36,7 @@ import org.navalplanner.web.planner.allocation.TaskInformation;
 import org.navalplanner.web.planner.allocation.TaskInformation.ITotalHoursCalculationListener;
 import org.navalplanner.web.planner.order.PlanningState;
 import org.navalplanner.web.planner.taskedition.EditTaskController;
+import org.navalplanner.web.planner.taskedition.TaskPropertiesController.ResourceAllocationTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
@@ -148,18 +149,18 @@ public class LimitingResourceAllocationController extends GenericForwardComposer
         return resourceAllocationModel.getResourceAllocationRows();
     }
 
-    public void onSelectWorkers(AllocationSelector allocationSelector) {
+    public void selectWorkers(AllocationSelector allocationSelector) {
         try {
             allocationSelector.addChoosen();
         } finally {
-            tabLimitingResourceAllocation.setSelected(true);
-            allocationSelector.clearAll();
+            closeSelectWorkers();
             Util.reloadBindings(gridLimitingAllocations);
         }
     }
 
-    public void onCloseSelectWorkers() {
+    public void closeSelectWorkers() {
         clear();
+        tabLimitingResourceAllocation.setSelected(true);
     }
 
     public void clear() {
diff --git a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul
index fdcaf9c49..10f24860d 100644
--- a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul
@@ -56,7 +56,7 @@
 
                     <hbox>
                         <newAllocationSelectorCombo id="limitingNewAllocationSelectorCombo" behaviour="LIMITING" />
-                        <button label="${i18n:_('Add')}" onClick="limitingAllocationController.onSelectWorkers(limitingNewAllocationSelectorCombo)" />
+                        <button label="${i18n:_('Add')}" onClick="limitingAllocationController.selectWorkers(limitingNewAllocationSelectorCombo)" />
                         <button label="${i18n:_('Advanced search')}" onClick="tabLimitingWorkerSearch.setSelected(true); " />
                     </hbox>
 
@@ -81,8 +81,8 @@
             <tabpanel >
                 <newAllocationSelector id="limitingNewAllocationSelector"  behaviour="LIMITING" />
                 <hbox>
-                    <button label="${i18n:_('Select')}" onClick="limitingAllocationController.onSelectWorkers(limitingNewAllocationSelector)" />
-                    <button label="${i18n:_('Close')}" onClick="limitingAllocationController.onCloseSelectWorkers()" />
+                    <button label="${i18n:_('Select')}" onClick="limitingAllocationController.selectWorkers(limitingNewAllocationSelector)" />
+                    <button label="${i18n:_('Close')}" onClick="limitingAllocationController.closeSelectWorkers()" />
                </hbox>
             </tabpanel>
         </tabpanels>