From 166213933f61d2a47bda0d315b5d0c0742a4816e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 28 Nov 2008 19:54:51 +0000 Subject: [PATCH] Monotone-Parent: b98feac746b0ff0001fe777c4f71e1930b761a59 Monotone-Revision: fd17d1db3508a9f1ae745c58c00d732b0459740e Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2008-11-28T19:54:51 Monotone-Branch: ca.inverse.sogo --- SoObjects/Appointments/SOGoAppointmentObject.m | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index acd7b61a2..7ea436021 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -348,18 +348,16 @@ if ([newEvent userIsOrganizer: ownerUser]) { - oldEvent = [self component: NO secure: NO]; - if (oldEvent) - [self _handleUpdatedEvent: newEvent fromOldEvent: oldEvent]; - else + if ([self isNew]) { + // New event -- send invitation to all attendees attendees = [newEvent attendeesWithoutUser: ownerUser]; if ([attendees count]) { [self _handleAddedUsers: attendees fromEvent: newEvent]; [self sendEMailUsingTemplateNamed: @"Invitation" forObject: [newEvent itipEntryWithMethod: @"request"] - previousObject: oldEvent + previousObject: nil toAttendees: attendees]; } @@ -367,6 +365,12 @@ [[newEvent uniqueChildWithTag: @"organizer"] setValue: 0 to: @""]; } + else + { + // Event is modified -- sent update status to all attendees + oldEvent = [self component: NO secure: NO]; + [self _handleUpdatedEvent: newEvent fromOldEvent: oldEvent]; + } } [super saveComponent: newEvent];