Monotone-Parent: ea2906474b300ee2b05e220e60eb4284af1e845a

Monotone-Revision: 02bca191f3d6f22210597517ed2f42a870e492cc

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-19T16:51:50
Monotone-Branch: ca.inverse.sogo

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

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 */

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();