From 7dabb5bd712bbcaca208fceb4dff8db2dc99f857 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Sat, 2 Jul 2011 13:22:34 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 40d6cb69296008deaa81f30c913c4413c0aa6997 Monotone-Revision: 5ff23472b81083bb4eaded5ffb57c52c92ce8f00 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-07-02T13:22:34 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Appointments/SOGoAppointmentObject.m | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 96628b14a..81eee4a90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-07-02 Ludovic Marcotte + + * SoObjects/Appointments/SOGoAppointmentObject.m (-PUTAction:) + We now update the request's content in case we got participants + with status change (for resources, for example) + 2011-06-29 Ludovic Marcotte * Added get/set/unset capabilities to sogo-tool to set diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index 89e3d1a15..747ff8713 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -1670,6 +1670,13 @@ { if ((ex = [self _handleAddedUsers: attendees fromEvent: event])) return ex; + else + { + // We might have auto-accepted resources here. If that's the + // case, let's regerate the versitstring and replace the + // one from the request. + [rq setContent: [[[event parent] versitString] dataUsingEncoding: [rq contentEncoding]]]; + } [self sendEMailUsingTemplateNamed: @"Invitation" forObject: [event itipEntryWithMethod: @"request"]