diff --git a/ChangeLog b/ChangeLog index 4321567ce..df04bf7f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-22 Ludovic Marcotte + + * 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 * Fixed a crash issue in SOGoCache - we don't diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index f2000487e..e0620b845 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/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", - @"c_component", nil]; + fields = [NSArray arrayWithObjects: @"c_name", @"c_creationdate", + @"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]; } diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html index ae08537cb..3fc7b5dd1 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html @@ -1,4 +1,4 @@ -<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed +<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed <#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. diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod index bc8d38a29..8f13b01aa 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod @@ -45,3 +45,8 @@ IsBody: WOConditional { condition = isSubject; negate = YES; } + +Summary: WOString { + value = summary; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html index ae08537cb..3fc7b5dd1 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html @@ -1,4 +1,4 @@ -<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed +<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed <#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. diff --git a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod index bc8d38a29..d1eed40a4 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod @@ -45,3 +45,8 @@ IsBody: WOConditional { condition = isSubject; negate = YES; } + +Summary: WOString { + value = summary; + escapeHTML = NO; +} diff --git a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html index 31d34605d..3e601a5e8 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html @@ -1,4 +1,4 @@ -<#IsSubject>Le rendez-vous du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié +<#IsSubject>Le rendez-vous "<#Summary />" du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié <#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. diff --git a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod index bc8d38a29..8f13b01aa 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod @@ -45,3 +45,8 @@ IsBody: WOConditional { condition = isSubject; negate = YES; } + +Summary: WOString { + value = summary; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html index ae08537cb..3fc7b5dd1 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html @@ -1,4 +1,4 @@ -<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed +<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed <#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. diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod index bc8d38a29..8f13b01aa 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod @@ -45,3 +45,8 @@ IsBody: WOConditional { condition = isSubject; negate = YES; } + +Summary: WOString { + value = summary; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html index cce2fa90f..9f0635140 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html @@ -1,4 +1,4 @@ -<#IsSubject>L'appuntamento fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> è stato modificato +<#IsSubject>L'appuntamento "<#Summary />" fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> è stato modificato <#IsBody> Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /> (<#OldAptLocation />) alle ore <#OldAptStartTime /> è ora programmato il <#NewAptStartDate diff --git a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod index bc8d38a29..8f13b01aa 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod @@ -45,3 +45,8 @@ IsBody: WOConditional { condition = isSubject; negate = YES; } + +Summary: WOString { + value = summary; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html index ae08537cb..3fc7b5dd1 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html +++ b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html @@ -1,4 +1,4 @@ -<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed +<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed <#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. diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod index bc8d38a29..8f13b01aa 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod +++ b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod @@ -45,3 +45,8 @@ IsBody: WOConditional { condition = isSubject; negate = YES; } + +Summary: WOString { + value = summary; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index eabb610ae..e687bec2f 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -107,7 +107,7 @@ static BOOL sendEMailNotifications = NO; { if (!componentTag) [self subclassResponsibility: _cmd]; - + return componentTag; } diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m index 6cb214ccc..984659e12 100644 --- a/SoObjects/SOGo/SOGoUserDefaults.m +++ b/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