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

See ChangeLog

Browse Source 
Monotone-Parent: ac03f0324d16940145f9feb2cf56e61ed3ee5ef6
Monotone-Revision: 9aa24eb1e4a4107aaa9cf4e74e6f8c5b0477350a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-11-10T16:18:57
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-11-10 16:18:57 +00:00
parent 4f5f19e613
commit e1797c9365
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9 -1
View File
@@ -1,3 +1,8 @@
2009-11-10 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxComponentEditor.m (-_handleAttendeesEdition):
avoid scanning JSON when there's no attendee.
2009-11-07 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/SOGoCache.m - if we get a JSON
@@ -18,6 +23,9 @@
2009-11-05 Francis Lachapelle <flachapelle@inverse.ca>
* Scripts/updates.php: Minor changes to support when PHP short_open_tag
parameter is set to Off.
* UI/WebServerResources/ContactsUI.js (getMenus): activated the
list creation option of the addresbooks contextual menu.
@@ -3712,7 +3720,7 @@
* UI/MailerUI/UIxMailAccountActions.m ([WOResponse
-listMailboxesAction]): also returns the inbox quota, wrapped in a
new dictionary with keys "mailboxes" and "quotas". Uses the new user
default "SOGoSoftQuota" to force a quota and ignore the one
default "SOGoSoftQuotaRatio" to force a quota and ignore the one
returned by the IMAP server.
2008-09-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
UI/Scheduler/UIxComponentEditor.m
+26 -23
View File
@@ -1494,35 +1494,38 @@ RANGE(2);
request = [context request];
json = [request formValueForKey: @"attendees"];
attendees = [NSArray array];
jsonScanner = [NSScanner scannerWithString: json];
if ([jsonScanner scanJSONObject: &attendeesData])
if ([json length])
{
newAttendees = [NSMutableArray new];
attendees = [attendeesData allValues];
max = [attendees count];
for (count = 0; count < max; count++)
attendees = [NSArray array];
jsonScanner = [NSScanner scannerWithString: json];
if ([jsonScanner scanJSONObject: &attendeesData])
{
currentData = [attendees objectAtIndex: count];
currentEmail = [currentData objectForKey: @"email"];
currentAttendee = [component findParticipantWithEmail: currentEmail];
if (!currentAttendee)
newAttendees = [NSMutableArray new];
attendees = [attendeesData allValues];
max = [attendees count];
for (count = 0; count < max; count++)
{
currentAttendee = [iCalPerson elementWithTag: @"attendee"];
[currentAttendee setCn: [currentData objectForKey: @"name"]];
[currentAttendee setEmail: currentEmail];
[currentAttendee setRole: @"REQ-PARTICIPANT"];
[currentAttendee setRsvp: @"TRUE"];
[currentAttendee
setParticipationStatus: iCalPersonPartStatNeedsAction];
currentData = [attendees objectAtIndex: count];
currentEmail = [currentData objectForKey: @"email"];
currentAttendee = [component findParticipantWithEmail: currentEmail];
if (!currentAttendee)
{
currentAttendee = [iCalPerson elementWithTag: @"attendee"];
[currentAttendee setCn: [currentData objectForKey: @"name"]];
[currentAttendee setEmail: currentEmail];
[currentAttendee setRole: @"REQ-PARTICIPANT"];
[currentAttendee setRsvp: @"TRUE"];
[currentAttendee
setParticipationStatus: iCalPersonPartStatNeedsAction];
}
[newAttendees addObject: currentAttendee];
}
[newAttendees addObject: currentAttendee];
[component setAttendees: newAttendees];
[newAttendees release];
}
[component setAttendees: newAttendees];
[newAttendees release];
else
NSLog(@"Error scanning following JSON:\n%@", json);
}
else
NSLog(@"Error scanning following JSON:\n%@", json);
}
- (void) _handleOrganizer