From 4b6afd7b3c3b94e5c7f5ae8f083071bd1243acd1 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Fri, 28 Aug 2009 14:46:46 +0200
Subject: [PATCH]  ItEr23S08CUEdicionCalendarioLaboral: Reload properly
 calendar when parent is changed. Fixed issue on function to fill the parents
 combo.

---
 .../web/calendars/BaseCalendarCRUDController.java           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
index 6899a5bcb..489bdb5de 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
@@ -372,6 +372,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
         } else {
             Util.reloadBindings(createWindow);
         }
+        highlightDaysOnCalendar();
     }
 
     private void reloadDayInformation() {
@@ -404,11 +405,12 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
                     .getFellow("parentCalendars");
         }
 
-        fillParentCombo(parentCalendars);
+        fillParentComboAndMarkSelectedItem(parentCalendars);
         addListenerParentCombo(parentCalendars);
     }
 
-    private void fillParentCombo(Combobox parentCalendars) {
+    private void fillParentComboAndMarkSelectedItem(Combobox parentCalendars) {
+        parentCalendars.getChildren().clear();
         BaseCalendar parent = baseCalendarModel.getParent();
 
         List<BaseCalendar> possibleParentCalendars = getParentCalendars();