From 097e46d6865b5fa14869129d5c80247aa7f1a35f Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 24 Nov 2009 13:28:49 +0100
Subject: [PATCH]  ItEr35S08CUAsignacionCalendarioLaboralRecursoItEr25S09:
 Added model to BandboxSearch in order to reload the list of BaseCalendar
 every time.

---
 .../navalplanner/web/common/ConfigurationController.java  | 6 ++++++
 .../org/navalplanner/web/common/ConfigurationModel.java   | 8 ++++++++
 .../org/navalplanner/web/common/IConfigurationModel.java  | 7 +++++++
 .../src/main/webapp/common/configuration.zul              | 1 +
 4 files changed, 22 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index 12db5e5da..de385d265 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -22,6 +22,8 @@ package org.navalplanner.web.common;
 
 import static org.navalplanner.web.I18nHelper._;
 
+import java.util.List;
+
 import org.navalplanner.business.calendars.entities.BaseCalendar;
 import org.navalplanner.business.common.entities.Configuration;
 import org.navalplanner.web.common.components.bandboxsearch.BandboxSearch;
@@ -66,6 +68,10 @@ public class ConfigurationController extends GenericForwardComposer {
                 });
     }
 
+    public List<BaseCalendar> getCalendars() {
+        return configurationModel.getCalendars();
+    }
+
     public BaseCalendar getDefaultCalendar() {
         return configurationModel.getDefaultCalendar();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
index 517c26d32..d30229f64 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
@@ -20,6 +20,8 @@
 
 package org.navalplanner.web.common;
 
+import java.util.List;
+
 import org.navalplanner.business.calendars.daos.IBaseCalendarDAO;
 import org.navalplanner.business.calendars.entities.BaseCalendar;
 import org.navalplanner.business.common.daos.IConfigurationDAO;
@@ -48,6 +50,12 @@ public class ConfigurationModel implements IConfigurationModel {
     @Autowired
     private IBaseCalendarDAO baseCalendarDAO;
 
+    @Override
+    @Transactional(readOnly = true)
+    public List<BaseCalendar> getCalendars() {
+        return baseCalendarDAO.getBaseCalendars();
+    }
+
     @Override
     public BaseCalendar getDefaultCalendar() {
         if (configuration == null) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
index ee45bc821..374e980b7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
@@ -20,6 +20,8 @@
 
 package org.navalplanner.web.common;
 
+import java.util.List;
+
 import org.navalplanner.business.calendars.entities.BaseCalendar;
 
 /**
@@ -29,6 +31,11 @@ import org.navalplanner.business.calendars.entities.BaseCalendar;
  */
 public interface IConfigurationModel {
 
+    /*
+     * Non conversational steps
+     */
+    List<BaseCalendar> getCalendars();
+
     /*
      * Initial conversation steps
      */
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index b9e7a5238..d0c2b7a2b 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -36,6 +36,7 @@
             <label value="${i18n:_('Defautl calendar')}" />
             <bandboxSearch id="defaultCalendarBandboxSearch"
                 finder="BaseCalendarBandboxFinder"
+                model="@{configurationController.calendars}"
                 selectedElement="@{configurationController.defaultCalendar}" />
         </hbox>