See Changelog

Monotone-Parent: 87677ae4611dc3d4c0fcc7c8576441631b282a43
Monotone-Revision: 658c430f2ea9683140e903d44e47bc3af6e9f243

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-11-12T16:40:17
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,13 @@
+2010-11-12  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/SOGo/SOGoGCSFolder.m
+	(-folderPropertyValueInCategory:forUser:): new method that allows
+	to specify the user from which to fetch the settings.
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(-includeInFreeBusy): the verification is now performed on the
+	calendar owner's settings instead of the activer user's settings.
+
 2010-11-11  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (deleteSelectedMessages):

NEWS

@@ -9,6 +9,9 @@
   originating IP
 - added the ability to add categories to contacts as well as to configure the
   list of contact categories in the preferences
+- improved performance of live-loading of messages in the webmail interface
+- fixed a bug that would not identify which calendars must be excluded from the
+  freebusy information
 
 1.3-20101019 (1.3.3)
 --------------------

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -410,8 +410,10 @@ static NSNumber *sharedYes = nil;
 {
   NSNumber *excludeFromFreeBusy;
 
+  // Check if the owner (not the active user) has excluded the calendar from her/his free busy data.
   excludeFromFreeBusy
-    = [self folderPropertyValueInCategory: @"FreeBusyExclusions"];
+    = [self folderPropertyValueInCategory: @"FreeBusyExclusions"
+				  forUser: [SOGoUser userWithLogin: [self ownerInContext: context]]];
 
   return ![excludeFromFreeBusy boolValue];
 }

SoObjects/SOGo/SOGoGCSFolder.m

@@ -255,12 +255,19 @@ static NSArray *childRecordFields = nil;
 }
 
 - (id) folderPropertyValueInCategory: (NSString *) theKey
+{
+  return [self folderPropertyValueInCategory: theKey
+				     forUser: [context activeUser]];
+}
+
+- (id) folderPropertyValueInCategory: (NSString *) theKey
+			     forUser: (SOGoUser *) theUser
 {
   SOGoUserSettings *settings;
   NSDictionary *folderSettings;
   id value;
 
-  settings = [[context activeUser] userSettings];
+  settings = [theUser userSettings];
   folderSettings = [settings objectForKey: [container nameInContainer]];
   value = [[folderSettings objectForKey: theKey]
             objectForKey: [self folderReference]];