From e225a936cab9f9eec39aaae49713f33e486e2cfe Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 22 May 2009 21:01:47 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: cb24cbb64f18605eafb31a901df365faf026b2e3 Monotone-Revision: dec9b1733e709c1ad5b0be7dc9d1c4d9b2f6f991 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-05-22T21:01:47 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/Scheduler/UIxComponentEditor.m | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f08d58b83..b67af94ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-05-22 Francis Lachapelle + + * UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor + -_toolbarForOwner:andClientObject:]): ignore the participation + status for tasks so the usual edition toolbar appears. + 2009-05-21 Ludovic Marcotte * Regenerated the SOPE patchset so we now correctly diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index 3664158c2..1cd7c77f2 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -1843,11 +1843,14 @@ RANGE(2); if ([[component attendees] count] && [component userIsParticipant: ownerUser] - && !isOrganizer) + && !isOrganizer + // Lightning does not manage participation status within tasks, + // so we also ignore the participation status of tasks in the + // web interface. + && ![[component tag] isEqualToString: @"VTODO"]) { participationStatus = [[component findParticipant: ownerUser] participationStatus]; - /* Lightning does not manage participation status within tasks */ if (participationStatus == iCalPersonPartStatAccepted) toolbarFilename = @"SOGoAppointmentObjectDecline.toolbar"; else if (participationStatus == iCalPersonPartStatDeclined)