From 9cd9670741518af471030351ddbee23bbe64d4a0 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 14 Oct 2009 18:25:50 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: a9673b6b7feb76572f80c31fe67ba936ed709f8f Monotone-Revision: cff51eb80ef633a72d1cc7527a1092b597f57f55 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-10-14T18:25:50 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 9 ++++++++- UI/Scheduler/UIxComponentEditor.m | 17 +++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 391361d33..19e027138 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,15 @@ +2009-10-14 Francis Lachapelle + + * UI/Scheduler/UIxComponentEditor.m (-getEventRWType): the user + is not an attendee when dealing with web calendars. + (-_toolbarForOwner:andClientObject:): no toolbar should appear + when dealing with web calendars. + 2009-10-13 Ludovic Marcotte * SoObjects/SOGo/NSDictionary+BSJSONAdditions.m Fixed the objCType comparison on GNUstep for boolean - values - we must consider 'c' and 'C' + values - we must consider 'c' and 'C'. * SoObjects/SOGo/SOGoCache.m Introduce a localCache static variable to avoid going to memcached all the time. We'll cache values during diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index abeeec8eb..0dc4f3ebd 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -1919,13 +1919,14 @@ RANGE(2); if (isOrganizer) isOrganizer = ![ownerUser hasEmail: [[component organizer] sentBy]]; - if ([[component attendees] count] - && [component userIsParticipant: ownerUser] - && !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"]) + if ([componentCalendar isKindOfClass: [SOGoWebAppointmentFolder class]] + || ([[component attendees] count] + && [component userIsParticipant: ownerUser] + && !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"])) toolbarFilename = @"SOGoEmpty.toolbar"; else { @@ -2048,7 +2049,7 @@ RANGE(2); roles: nil]; if ([componentCalendar isKindOfClass: [SOGoWebAppointmentFolder class]]) - rc = 1; + rc = 2; else { if ([ownerUser isEqual: [context activeUser]])