Monotone-Parent: 8cbe30e65e9874e7812378f06bbda442c37788b4

Monotone-Revision: 4e51d1b406f53fd851401045c1e1cbda60936faa

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-09T21:00:00
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-04-09 21:00:00 +00:00
parent 3dab983c97
commit badd3a7ef3
2 changed files with 19 additions and 7 deletions

View File

@@ -1,5 +1,11 @@
2010-04-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailPartViewers/UIxMailPartICalActions.m
(_eventObjectWithUID:forUser:): fixed a typo that would cause the
found event to never be returned.
(-updateUserStatusAction): return a 404 status code when the
corresponding event is not found.
* SoObjects/Mailer/SOGoMailFolder.m (-aclsForUser:): don't fetch
ACL when the current user is not the mailbox owner. Also, we don't
set default viewing roles when the uid is not the active user.

View File

@@ -96,7 +96,7 @@
{
eventObject = [folder lookupName: cname inContext: context
acquire: NO];
if (![eventObject isKindOfClass: [NSException class]])
if ([eventObject isKindOfClass: [NSException class]])
eventObject = nil;
}
}
@@ -410,12 +410,18 @@
{
eventObject = [self _eventObjectWithUID: [emailEvent uid]];
calendarEvent = [eventObject component: NO secure: NO];
if (([[emailEvent sequence] compare: [calendarEvent sequence]]
!= NSOrderedAscending)
&& ([self _updateParticipantStatusInEvent: calendarEvent
fromEvent: emailEvent
inObject: eventObject]))
response = [self responseWith204];
if (calendarEvent)
{
if (([[emailEvent sequence] compare: [calendarEvent sequence]]
!= NSOrderedAscending)
&& ([self _updateParticipantStatusInEvent: calendarEvent
fromEvent: emailEvent
inObject: eventObject]))
response = [self responseWith204];
}
else
response = [self responseWithStatus: 404
andString: @"Local event not found."];
}
if (!response)