amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-11 18:01:23 +00:00
Code Issues Projects Releases Wiki Activity

merge of '78eddfb311776e904d4f6650bcc5e2930af4519a'

Browse Source 
and 'cff51eb80ef633a72d1cc7527a1092b597f57f55'

Monotone-Parent: 78eddfb311776e904d4f6650bcc5e2930af4519a
Monotone-Parent: cff51eb80ef633a72d1cc7527a1092b597f57f55
Monotone-Revision: 9808a0781250c62da6dbd16dbd959fef199ace09

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-14T18:28:07
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-14 18:28:07 +00:00
parent 29e239bba0 9cd9670741
commit b6d3139fb7
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,10 @@
2009-10-14 Francis Lachapelle <flachapelle@inverse.ca>
* 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-14 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/Scheduler/UIxCalMainActions.m
@@ -8,7 +15,7 @@
* 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

17
UI/Scheduler/UIxComponentEditor.m
View File

@@ -1920,13 +1920,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
{
@@ -2049,7 +2050,7 @@ RANGE(2);
roles: nil];
if ([componentCalendar isKindOfClass: [SOGoWebAppointmentFolder class]])
rc = 1;
rc = 2;
else
{
if ([ownerUser isEqual: [context activeUser]])