From edb9bed9b95d5cbb1ab899909901857557db5d45 Mon Sep 17 00:00:00 2001
From: C Robert <crobert@inverse.ca>
Date: Tue, 21 Jul 2009 18:45:25 +0000
Subject: [PATCH] Monotone-Parent: 002cfad9d108ff7c2b34603852b074ecd764cf96
 Monotone-Revision: 907a11a883fa8eef30169c4b85233afb04b20e2c

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-21T18:45:25
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                            |  5 ++---
 UI/Scheduler/UIxCalendarProperties.h |  1 +
 UI/Scheduler/UIxCalendarProperties.m | 11 ++++++++++-
 UI/WebServerResources/SchedulerUI.js |  2 --
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c5d3fe89..a403c4f0b 100644
--- a/ChangeLog
+++ b/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>
 
diff --git a/UI/Scheduler/UIxCalendarProperties.h b/UI/Scheduler/UIxCalendarProperties.h
index 91696ba87..831f2471c 100644
--- a/UI/Scheduler/UIxCalendarProperties.h
+++ b/UI/Scheduler/UIxCalendarProperties.h
@@ -29,6 +29,7 @@
 @interface UIxCalendarProperties : UIxComponent
 {
   SOGoAppointmentFolder *calendar;
+  BOOL reloadTasks;
 }
 
 - (NSString *) calendarName;
diff --git a/UI/Scheduler/UIxCalendarProperties.m b/UI/Scheduler/UIxCalendarProperties.m
index 14a54bcfb..f940087d4 100644
--- a/UI/Scheduler/UIxCalendarProperties.m
+++ b/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
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index ca1e0fd27..e28161e59 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/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) {