amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-28 17:57:38 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 3d88bd203af6504eee5fcea3bde52990d2512a3a

Browse Source 
Monotone-Revision: e2c0c29f57790c11b70402648fcea481f24b2a1b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-12-03T16:18:12
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-12-03 16:18:12 +00:00
parent 6e6adf9038
commit 25ee135fdc
4 changed files with 163 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentObject.m
+23 -6
View File
@@ -163,7 +163,7 @@
NSString *possibleName;
folder = [container lookupCalendarFolderForUID: uid];
// should call lookupCalendarFoldersForUIDs to search among all folders
#warning Should call lookupCalendarFoldersForUIDs to search among all folders
object = [folder lookupName: nameInContainer
inContext: context acquire: NO];
if ([object isKindOfClass: [NSException class]])
@@ -364,6 +364,8 @@
{
iCalEvent *oldEvent;
NSArray *attendees;
NSCalendarDate *recurrenceId;
NSString *recurrenceTime;
SOGoUser *ownerUser;
[[newEvent parent] setMethod: @""];
@@ -395,8 +397,23 @@
else
{
// Event is modified -- sent update status to all attendees
oldEvent = [self component: NO secure: NO];
recurrenceId = [newEvent recurrenceId];
if (recurrenceId == nil)
oldEvent = [self component: NO secure: NO];
else
{
// If recurrenceId is defined, find the specified occurence
// within the repeating vEvent.
recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
oldEvent = (iCalEvent*)[self lookupOccurence: recurrenceTime];
if (oldEvent == nil)
// If no occurence found, create one
oldEvent = (iCalEvent*)[self newOccurenceWithID: recurrenceTime];
}
[self _handleUpdatedEvent: newEvent fromOldEvent: oldEvent];
// The sequence has possibly been increased -- resave the event
[super saveComponent: newEvent];
}
}
}
@@ -437,7 +454,7 @@
{
// We must update main event and all its occurences (if any).
calendar = [eventObject calendar: NO secure: NO];
event = [calendar firstChildWithTag: [self componentTag]];
event = (iCalEntityObject*)[calendar firstChildWithTag: [self componentTag]];
events = [calendar allObjects];
}
else
@@ -891,16 +908,16 @@
// If _recurrenceId is defined, find the specified occurence
// within the repeating vEvent.
recurrenceTime = [NSString stringWithFormat: @"%f", [_recurrenceId timeIntervalSince1970]];
event = [self lookupOccurence: recurrenceTime];
event = (iCalEvent*)[self lookupOccurence: recurrenceTime];
if (event == nil)
// If no occurence found, create one
event = [self newOccurenceWithID: recurrenceTime];
event = (iCalEvent*)[self newOccurenceWithID: recurrenceTime];
}
else
// No specific occurence specified; return the first vEvent of
// the vCalendar.
event = [calendar firstChildWithTag: [self componentTag]];
event = (iCalEvent*)[calendar firstChildWithTag: [self componentTag]];
}
if (event)
{