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

See ChangeLog

Browse Source 
Monotone-Parent: 20415379d4ad22b602692f50041a0eb207e1d1fb
Monotone-Revision: c9f767434992867f4e642881a1161a8a606c338f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-01T18:55:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-04-01 18:55:02 +00:00
parent 7aca9d276b
commit dadedfa295
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2011-04-01 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentObject.m (-PUTAction:):
when adding a new occurrence, instantiate an occurrence from the
previous calendar in order to perform a proper changes comparison.
2011-04-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/SchedulerUI.js (initCalendars): initialize
SoObjects/Appointments/SOGoAppointmentObject.m
+12 -6
View File
@@ -599,7 +599,7 @@
oldEvent = (iCalEvent*)[self lookupOccurence: recurrenceTime];
if (oldEvent == nil)
// If no occurence found, create one
oldEvent = (iCalEvent*)[self newOccurenceWithID: recurrenceTime];
oldEvent = (iCalEvent *)[self newOccurenceWithID: recurrenceTime];
}
oldMasterEvent = (iCalEvent *) [[oldEvent parent] firstChildWithTag: [self componentTag]];
@@ -1563,6 +1563,13 @@
// If not present, we assume it was created before the PUT
oldEvent = [self _eventFromRecurrenceId: [newEvent recurrenceId]
events: oldEvents];
if (oldEvent == nil)
{
NSString *recurrenceTime;
recurrenceTime = [NSString stringWithFormat: @"%f", [[newEvent recurrenceId] timeIntervalSince1970]];
oldEvent = (iCalEvent *)[self newOccurenceWithID: recurrenceTime];
}
// If present, we look for changes
changes = [iCalEventChanges changesFromEvent: oldEvent toEvent: newEvent];
@@ -1630,8 +1637,7 @@
uid = [[newEvent organizer] uid];
else
uid = [[[[[newEvent parent] events] objectAtIndex: 0] organizer] uid];
if ([uid caseInsensitiveCompare: owner] == NSOrderedSame)
{
[self _handleUpdatedEvent: newEvent fromOldEvent: oldEvent];
@@ -1676,14 +1682,14 @@
// the user has declined this occurence.
if ([[changes updatedProperties] containsObject: @"exdate"])
{
[self changeParticipationStatus: @"DECLINED"
[self changeParticipationStatus: @"DECLINED"
withDelegate: nil // FIXME (specify delegate?)
forRecurrenceId: [self _addedExDate: oldEvent newEvent: newEvent]];
}
else
[self changeParticipationStatus: [attendee partStat]
withDelegate: delegate
forRecurrenceId: recurrenceId];
withDelegate: delegate
forRecurrenceId: recurrenceId];
}
}
}