See ChangeLog

Monotone-Parent: 434bb07a3b51027135236efad4365813a470e946
Monotone-Revision: d5b97dd613695b722316f9c4bf4e5d35241a832e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-11-22T21:52:40
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,10 @@
+2008-11-22  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * Modified the invitation "update" templates
+	to display the summar in the email subject.
+	* Commented out a premature optimization in
+	SOGoAppointmentFolder.m
+
 2008-11-20  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Fixed a crash issue in SOGoCache - we don't

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -1470,25 +1470,29 @@ static Class sogoAppointmentFolderKlass = Nil;
   // has only asked for {DAV:}getetag with no other properties,
   // we do not load the c_content and other fields from the
   // database as this can be pretty costly.
+#if 0
+  // FOR AN UNKNOWN REASON FOR NOW, THIS GENERATES EMPTY ETAGS (ALL HAVE GCS0000000 VALUE)
   if ([*properties caseInsensitiveCompare: @"{DAV:}getetag"] == NSOrderedSame &&
       !*(properties+1))
-    fields =[NSArray arrayWithObjects: @"c_name", @"c_version",
+    fields =  [NSArray arrayWithObjects: @"c_name", @"c_creationdate",
-		     @"c_component", nil];
+		       @"c_lastmodified", @"c_version",
+		       @"c_component", nil];
   else
+#endif
     fields = reportQueryFields;
 
   filterList = [filters objectEnumerator];
   while ((currentFilter = [filterList nextObject]))
     {
       additionalFilters = [self _composeAdditionalFilters: currentFilter];
-      NSLog(@"query");
+      //NSLog(@"query");
       apts = [self bareFetchFields: fields
 		   from: [currentFilter objectForKey: @"start"]
                    to: [currentFilter objectForKey: @"end"]
 		   title: [currentFilter objectForKey: @"title"]
                    component: [currentFilter objectForKey: @"name"]
 		   additionalFilters: additionalFilters];
-      NSLog(@"adding properties");
+      //NSLog(@"adding properties");
       max = [apts count];
       buffer = [[NSMutableString alloc] initWithCapacity: max*512];
       for (count = 0; count < max; count++)
@@ -1496,7 +1500,7 @@ static Class sogoAppointmentFolderKlass = Nil;
 	      properties: properties
 	      withBaseURL: baseURL
 	      toBuffer: buffer];
-      NSLog(@"done");
+      //NSLog(@"done");
       [response appendContentString: buffer];
       [buffer release];
     }

SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html

@@ -1,4 +1,4 @@
-<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
+<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#IsBody>
 This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
 Please make a decision for these new settings.

SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod

@@ -45,3 +45,8 @@ IsBody: WOConditional {
   condition = isSubject;
   negate    = YES;
 }
+
+Summary: WOString {
+  value = summary;
+  escapeHTML = NO;
+}

SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html

@@ -1,4 +1,4 @@
-<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
+<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#IsBody>
 This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
 Please make a decision for these new settings.

SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod

@@ -45,3 +45,8 @@ IsBody: WOConditional {
   condition = isSubject;
   negate    = YES;
 }
+
+Summary: WOString {
+  value = summary;
+  escapeHTML = NO;
+}

SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html

@@ -1,4 +1,4 @@
-<#IsSubject>Le rendez-vous du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié</#IsSubject>
+<#IsSubject>Le rendez-vous "<#Summary />" du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié</#IsSubject>
 <#IsBody>
 La réunion qui devait se dérouler le <#OldAptStartDate /> à <#OldAptStartTime /> (<#OldAptLocation />) est maintenant prévue le <#NewAptStartDate /> à <#NewAptStartTime /> (<#NewAptLocation />).
 Vous êtes invité à accepter ou refuser de participer à la réunion pour cette nouvelle date.

SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod

@@ -45,3 +45,8 @@ IsBody: WOConditional {
   condition = isSubject;
   negate    = YES;
 }
+
+Summary: WOString {
+  value = summary;
+  escapeHTML = NO;
+}

SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html

@@ -1,4 +1,4 @@
-<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
+<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#IsBody>
 This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
 Please make a decision for these new settings.

SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod

@@ -45,3 +45,8 @@ IsBody: WOConditional {
   condition = isSubject;
   negate    = YES;
 }
+
+Summary: WOString {
+  value = summary;
+  escapeHTML = NO;
+}

SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html

@@ -1,4 +1,4 @@
-<#IsSubject>L'appuntamento fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> &egrave; stato modificato </#IsSubject>
+<#IsSubject>L'appuntamento "<#Summary />" fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> &egrave; stato modificato </#IsSubject>
 <#IsBody>
 Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /> (<#OldAptLocation />)
 alle ore <#OldAptStartTime /> &egrave; ora programmato il <#NewAptStartDate

SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod

@@ -45,3 +45,8 @@ IsBody: WOConditional {
   condition = isSubject;
   negate    = YES;
 }
+
+Summary: WOString {
+  value = summary;
+  escapeHTML = NO;
+}

SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html

@@ -1,4 +1,4 @@
-<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
+<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#IsBody>
 This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
 Please make a decision for these new settings.

SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod

@@ -45,3 +45,8 @@ IsBody: WOConditional {
   condition = isSubject;
   negate    = YES;
 }
+
+Summary: WOString {
+  value = summary;
+  escapeHTML = NO;
+}

SoObjects/SOGo/SOGoUserDefaults.m

@@ -275,7 +275,6 @@ static NSString *uidColumnName = @"c_uid";
 	      [d setObject: values forKey: @"values"];
 	      [d setObject: uid  forKey: @"uid"];
 
-#warning reenable when the code to use the SOGoCache is finished	      
 	      [[NSDistributedNotificationCenter defaultCenter]
 		postNotificationName: ([fieldName isEqualToString: @"c_defaults"] ? @"SOGoUserDefaultsHaveChanged" : @"SOGoUserSettingsHaveChanged")
 		object: nil