[CalendarServer-changes] [3634] CalendarServer/trunk/twistedcaldav/scheduling

[source_changes at macosforge.org]

Revision: 3634
          http://trac.macosforge.org/projects/calendarserver/changeset/3634
Author:   sagen at apple.com
Date:     2009-02-04 09:52:18 -0800 (Wed, 04 Feb 2009)
Log Message:
-----------
When canceling an occurrence, use the properties of the occurrence instead of the master.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/itip.py
    CalendarServer/trunk/twistedcaldav/scheduling/test/test_itip.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/itip.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/itip.py	2009-02-03 16:44:38 UTC (rev 3633)
+++ CalendarServer/trunk/twistedcaldav/scheduling/itip.py	2009-02-04 17:52:18 UTC (rev 3634)
@@ -447,7 +447,7 @@
             else:
                 instance = original.overriddenComponent(instance_rid)
                 if instance is None:
-                    instance = original.masterComponent()
+                    instance = original.deriveInstance(instance_rid)
             assert instance is not None, "Need a master component"
 
             # Add some required properties extracted from the original

Modified: CalendarServer/trunk/twistedcaldav/scheduling/test/test_itip.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/test/test_itip.py	2009-02-03 16:44:38 UTC (rev 3633)
+++ CalendarServer/trunk/twistedcaldav/scheduling/test/test_itip.py	2009-02-04 17:52:18 UTC (rev 3634)
@@ -989,7 +989,7 @@
 BEGIN:VEVENT
 UID:12345-67890-3
 RECURRENCE-ID:20081114T000000Z
-DTSTART:20071114T000000Z
+DTSTART:20081114T000000Z
 ATTENDEE:mailto:user2 at example.com
 ORGANIZER:mailto:user1 at example.com
 SEQUENCE:1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090204/fae6ada8/attachment.html>