Monotone-Parent: 002cfad9d108ff7c2b34603852b074ecd764cf96

Monotone-Revision: 907a11a883fa8eef30169c4b85233afb04b20e2c

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-21T18:45:25
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,14 +1,13 @@
 2009-07-21  Cyril Robert <crobert@inverse.ca>
 
 	* UI/Scheduler/UIxCalendarProperties.m: Prevent doing anything when not
-	executing @"saveProperties".
+	executing @"saveProperties". Added wrapper methods for
+	showCalendarTasks/Alarms. Added reloadTasks var.
 	* SoObjects/Appointments/SOGoAppointmentFolder.m: Added
 	(set/showCalendarTasks), (set/showCalendarAlarms)
 	* SoObjects/SOGo/SOGoGCSFolder.m: Added dicts to cleanup on unsubscribe.
 	* UI/Scheduler/UIxCalListingActions.m: Added support for
 	showCalendarAlarms/Tasks.
-	* UI/Scheduler/UIxCalendarProperties.m: Added wrapper methods for
-	showCalendarTasks/Alarms
 
 2009-07-21  Francis Lachapelle  <flachapelle@inverse.ca>
 

UI/Scheduler/UIxCalendarProperties.h

@@ -29,6 +29,7 @@
 @interface UIxCalendarProperties : UIxComponent
 {
   SOGoAppointmentFolder *calendar;
+  BOOL reloadTasks;
 }
 
 - (NSString *) calendarName;

UI/Scheduler/UIxCalendarProperties.m

@@ -32,6 +32,7 @@
   if ((self = [super init]))
     {
       calendar = [self clientObject];
+      reloadTasks = NO;
     }
 
   return self;
@@ -94,6 +95,8 @@
 
 - (void) setShowCalendarAlarms: (BOOL) new
 {
+  if (new != [calendar showCalendarAlarms])
+    reloadTasks = YES;
   [calendar setShowCalendarAlarms: new];
 }
 
@@ -104,6 +107,8 @@
 
 - (void) setShowCalendarTasks: (BOOL) new
 {
+  if (new != [calendar showCalendarTasks])
+    reloadTasks = YES;
   [calendar setShowCalendarTasks: new];
 }
 
@@ -119,7 +124,11 @@
 
 - (id <WOActionResults>) savePropertiesAction
 {
-  return [self jsCloseWithRefreshMethod: nil];
+  NSString *action = nil;
+
+  if (reloadTasks)
+    action = @"refreshTasks()";
+  return [self jsCloseWithRefreshMethod: action];
 }
 
 @end

UI/WebServerResources/SchedulerUI.js

@@ -1823,8 +1823,6 @@ function updateCalendarProperties(calendarID, calendarName, calendarColor) {
     }
 
     appendStyleElement(nodeID, calendarColor);
-    //This is bad
-    setTimeout ("refreshTasks ()", 200);
 }
 
 function onCalendarNew(event) {