From 7bb826bafd4bdcb01296d372b5da9c4a4a54e2b0 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Sun, 19 Jul 2009 16:51:50 +0000
Subject: [PATCH] Monotone-Parent: ea2906474b300ee2b05e220e60eb4284af1e845a
 Monotone-Revision: 02bca191f3d6f22210597517ed2f42a870e492cc

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-19T16:51:50
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                            | 9 +++++++++
 UI/Scheduler/UIxCalFilterPanel.m     | 8 +++++++-
 UI/WebServerResources/SchedulerUI.js | 2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8843a2346..99889aa7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/SchedulerUI.js: initialize the
+	"listFilter" global var depending on the value of the filter
+	popup.
+
+	* UI/Scheduler/UIxCalFilterPanel.m (-selectedFilter): return
+	"view_today" as default filter.
+
 2009-07-17  Cyril Robert <crobert@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/UI/Scheduler/UIxCalFilterPanel.m b/UI/Scheduler/UIxCalFilterPanel.m
index 8bfdfbd75..20f511813 100644
--- a/UI/Scheduler/UIxCalFilterPanel.m
+++ b/UI/Scheduler/UIxCalFilterPanel.m
@@ -109,7 +109,13 @@ static NSArray *filters = nil;
 
 - (NSString *) selectedFilter
 {
-  return [self queryParameterForKey: @"filterpopup"];
+  NSString *selectedFilter;
+
+  selectedFilter = [self queryParameterForKey: @"filterpopup"];
+  if (![selectedFilter length])
+    selectedFilter = @"view_today";
+
+  return selectedFilter;
 }
 
 @end /* UIxCalFilterPanel */
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 3c39e25d1..44fc80c5d 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2071,7 +2071,7 @@ function initCalendars() {
   
     if (!$(document.body).hasClassName("popup")) {
         var node = $("filterpopup");
-        node.value = listFilter;
+        listFilter = node.value;
         initDateSelectorEvents();
         initCalendarSelector();
         configureSearchField();