Revision

3634

Author

sagen@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

Diff

--- 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

--- 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@example.com
 ORGANIZER:mailto:user1@example.com
 SEQUENCE:1