From be05ecb080e90431c381db60b16a9b8dd7d77374 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 7 Aug 2008 13:31:55 +0000 Subject: [PATCH] Monotone-Parent: a82b89ed6794d62fbcabb12688b8956d64694462 Monotone-Revision: ea86e141cbd73fc3e86b88728a7c612afe996d19 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-07T13:31:55 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoUserFolder+Appointments.m | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index af899e0cc..5c34e2dc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-08-07 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoUserFolder+Appointments.m + ([SOGoUserFolder -davCalendarUserAddressSet]): the addresses + returned should be those of the owner and not of the current user. + * SoObjects/Appointments/SOGoAppointmentObject.m ([SOGoAppointmentObject +webdavAclManager]): declare DAV:write as equivalent of ..._ModifyComponent (instead of DAV:write-content). diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m index 5d3ef1e07..d6817daed 100644 --- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m +++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m @@ -47,15 +47,16 @@ - (NSArray *) davCalendarUserAddressSet { - NSArray *tag, *allEmails; + NSArray *tag; NSMutableArray *addresses; NSEnumerator *emails; NSString *currentEmail; + SOGoUser *ownerUser; addresses = [NSMutableArray array]; - allEmails = [[context activeUser] allEmails]; - emails = [allEmails objectEnumerator]; + ownerUser = [SOGoUser userWithLogin: owner roles: nil]; + emails = [[ownerUser allEmails] objectEnumerator]; while ((currentEmail = [emails nextObject])) { tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",