From 39fac350723240b04c5402d1943f5aa6b6c2af45 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Tue, 6 Oct 2009 20:15:03 +0200
Subject: [PATCH]  ItEr29S06CUAsignacionGrupoRecursosAPlanificacionItEr28S06:
 Resource allocation window now is closable

---
 .../web/planner/allocation/ResourceAllocationController.java   | 3 ++-
 navalplanner-webapp/src/main/webapp/planner/order.zul          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 ea6464f33..75d822535 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
@@ -141,6 +141,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
         CalculationTypeRadio calculationTypeRadio = CalculationTypeRadio
                 .from(formBinder.getCalculatedValue());
         calculationTypeRadio.doTheSelectionOn(calculationTypeSelector);
+        tbResourceAllocation.setSelected(true);
         Util.reloadBindings(window);
         try {
             window.doModal();
@@ -288,7 +289,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
 
     // Triggered when closable button is clicked
     public void onClose(Event event) {
-        window.setVisible(false);
+        cancel();
         event.stopPropagation();
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index 9503fa1b1..3b3b39c02 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -82,7 +82,7 @@
     </popup>
 
     <window id="resourceAllocationWindow" self="@{define(content)}"
-        apply="${allocationController}"
+        apply="${allocationController}" closable="true"
         title="${i18n:_('Resource allocation')}" width="600px" visible="false">
 
     <tabbox mold="accordion">