amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: ad53dc521ff4231b5a6c7a7185ce6deda193e7e8
Monotone-Revision: f84e4aaa7eb033904461e3ce48ce2ff0919a7a30

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-11-13T13:41:43
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2008-11-13 13:41:43 +00:00
parent 171dfbfb3d
commit 5ea4891a28
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+10
View File
@@ -1,3 +1,13 @@
2008-11-13 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentObject.m
We now remove the SENT-BY when updating attendees
if it's the attendee himself that changes his
particpation status
* SoObjects/SOGo/SOGoUserFolder.m
Improve the comparison of strings by rather using
URL objects.
2008-11-11 Ludovic Marcotte <lmarcotte@inverse.ca>
* Fixed a couple of issues in the new pref caching
SoObjects/Appointments/SOGoAppointmentObject.m
+15 -2
View File
@@ -410,7 +410,14 @@
[otherAttendee addAttribute: @"SENT-BY"
value: [NSString stringWithFormat: @"\"MAILTO:%@\"", currentEmail]];
}
else
{
// We must REMOVE any SENT-BY here. This is important since if A accepted
// the event for B and then, B changes by himself his participation status,
// we don't want to keep the previous SENT-BY attribute there.
[(NSMutableDictionary *)[otherAttendee attributes] removeObjectForKey: @"SENT-BY"];
}
iCalString = [[event parent] versitString];
error = [eventObject saveContentString: iCalString];
}
@@ -453,6 +460,13 @@
[attendee addAttribute: @"SENT-BY"
value: [NSString stringWithFormat: @"\"MAILTO:%@\"", currentEmail]];
}
else
{
// We must REMOVE any SENT-BY here. This is important since if A accepted
// the event for B and then, B changes by himself his participation status,
// we don't want to keep the previous SENT-BY attribute there.
[(NSMutableDictionary *)[attendee attributes] removeObjectForKey: @"SENT-BY"];
}
// We generate the updated iCalendar file and we save it
// in the database.
@@ -690,7 +704,6 @@
iCalPerson *attendee, *person;
SOGoAppointmentObject *recipientEvent;
SOGoUser *ownerUser;
NSString *email;
elements = [NSMutableArray array];
event = [self component: NO secure: NO];
SoObjects/SOGo/SOGoUserFolder.m
+6 -5
View File
@@ -271,14 +271,15 @@
- (void) _appendCollectionsMatchingFilter: (NSDictionary *) filter
toResponse: (WOResponse *) r
{
NSString *prefix, *queryOwner, *uid;
NSURL *prefix, *queryOwner;
NSDictionary *folders;
NSString *uid;
prefix = [self _baseDAVURLWithSuffix: @"users/"];
queryOwner = [filter objectForKey: @"owner"];
if ([queryOwner hasPrefix: prefix])
prefix = [NSURL URLWithString: [self _baseDAVURLWithSuffix: @"users/"]];
queryOwner = [NSURL URLWithString: [filter objectForKey: @"owner"]];
if ([[queryOwner relativePath] hasPrefix: [prefix relativePath]])
{
uid = [queryOwner substringFromIndex: [prefix length]];
uid = [[queryOwner relativePath] lastPathComponent];
folders = [self foldersOfType: [filter objectForKey: @"resource-type"]
matchingUID: uid];
[self _appendFolders: folders toResponse: r];