From f0e37a88853250486ecad6bbee9c1be69f2357e2 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Mon, 19 Oct 2009 12:56:52 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 8a33774ff55089b02c43fb1a6d1acfd98521c634 Monotone-Revision: ccaab9322e172157de4d07dca19f1e071e7836a4 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-10-19T12:56:52 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SoObjects/Appointments/SOGoAppointmentObject.m | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b78109ce2..894b7f40c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-10-19 Ludovic Marcotte + + * SoObjects/Appointments/SOGoAppointmentObject.m + (saveComponent:) - in case of an update, we check + if no organizer was specified when handling + attendees addition to the event. + 2009-10-17 Ludovic Marcotte * UI/WebServerResources/UIxListEditor.js (endEditable): diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index 043264fb3..dbf11562f 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -546,6 +546,7 @@ } else { + BOOL hasOrganizer; // Event is modified -- sent update status to all attendees // and modify their calendars. recurrenceId = [newEvent recurrenceId]; @@ -562,12 +563,12 @@ oldEvent = (iCalEvent*)[self newOccurenceWithID: recurrenceTime]; } - oldMasterEvent - = (iCalEvent *) [[oldEvent parent] firstChildWithTag: [self componentTag]]; - if ([oldMasterEvent userIsOrganizer: ownerUser]) + oldMasterEvent = (iCalEvent *) [[oldEvent parent] firstChildWithTag: [self componentTag]]; + hasOrganizer = [[[oldMasterEvent organizer] email] length]; + + if (!hasOrganizer || [oldMasterEvent userIsOrganizer: ownerUser]) { // The owner is the organizer of the event; handle the modifications - [self _handleUpdatedEvent: newEvent fromOldEvent: oldEvent]; // The sequence has possibly been increased -- resave the event.