[CalendarServer-changes] [3161] CalendarServer/trunk/twistedcaldav/scheduling/implicit.py

[source_changes at macosforge.org]

Revision: 3161
          http://trac.macosforge.org/projects/calendarserver/changeset/3161
Author:   cdaboo at apple.com
Date:     2008-10-15 20:15:14 -0700 (Wed, 15 Oct 2008)
Log Message:
-----------
Missed some logic in detecting removed attendees from a newly added overridden instance.
Need to think up a more elegant way to do this whole thing as it is getting too complicated.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/implicit.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/implicit.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/implicit.py	2008-10-16 03:12:54 UTC (rev 3160)
+++ CalendarServer/trunk/twistedcaldav/scheduling/implicit.py	2008-10-16 03:15:14 UTC (rev 3161)
@@ -300,6 +300,7 @@
         oldInstances = set(self.oldcalendar.getComponentInstances())
         newInstances = set(self.calendar.getComponentInstances())
         removedInstances = oldInstances - newInstances
+        addedInstances = newInstances - oldInstances
 
         # Also look for new EXDATEs
         oldexdates = set()
@@ -342,6 +343,12 @@
                 if exdate not in removedInstances:
                     self.cancelledAttendees.add((attendee, exdate))
 
+        # For overridden instances added, check whether any attendees were removed from the master
+        for attendee, _ignore in master_attendees:
+            for rid in addedInstances:
+                if (attendee, rid) not in mappedNew and rid not in oldexdates:
+                    self.cancelledAttendees.add((attendee, rid))
+
     @inlineCallbacks
     def scheduleWithAttendees(self):
         
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081015/a7af4d4f/attachment.html