From 1abc40c1270f11825e10b993ebe91d3fd2da8dba Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 18 Jul 2012 19:05:58 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: f489c387ef5efde7f9beee4a9b97ecf85275ffb2 Monotone-Revision: 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-07-18T19:05:58 --- ChangeLog | 8 ++++++++ SoObjects/Appointments/SOGoAppointmentObject.m | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c7f45946..4afa5d28e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-07-18 Ludovic Marcotte + + * SoObjects/Appointments/SOGoAppointmentObject.m + (_setupResponseInRequestCalendar:): we now return the + calendar read from the database and not use the one + from the request anymore, as it can override properties + other than participation status changes. + 2012-07-18 Jean Raby * Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh * Scripts/sql-update-1.3.16_to_1.3.17.sh: diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index 5c2cdd151..714d15693 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -1534,7 +1534,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent return partStats; } -- (void) _setupResponseInRequestCalendar: (iCalCalendar *) rqCalendar +- (iCalCalendar *) _setupResponseInRequestCalendar: (iCalCalendar *) rqCalendar { iCalCalendar *calendar; NSArray *keys; @@ -1559,6 +1559,8 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent } } } + + return calendar; } - (void) _adjustTransparencyInRequestCalendar: (iCalCalendar *) rqCalendar @@ -1718,7 +1720,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent // if ([roles containsObject: @"ComponentResponder"] && ![roles containsObject: @"ComponentModifier"]) - [self _setupResponseInRequestCalendar: calendar]; + calendar = [self _setupResponseInRequestCalendar: calendar]; else { if (![[rq headersForKey: @"X-SOGo"]