[CalendarServer-changes] [3792] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3792
          http://trac.macosforge.org/projects/calendarserver/changeset/3792
Author:   cdaboo at apple.com
Date:     2009-03-03 18:18:50 -0800 (Tue, 03 Mar 2009)
Log Message:
-----------
Make sure recurrences are properly returned in schedule-changes property.

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

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2009-03-04 02:16:16 UTC (rev 3791)
+++ CalendarServer/trunk/run	2009-03-04 02:18:50 UTC (rev 3792)
@@ -707,7 +707,7 @@
 
 caldavtester="${top}/CalDAVTester";
 
-svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3788;
+svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 3791;
 
 #
 # PyFlakes

Modified: CalendarServer/trunk/twistedcaldav/scheduling/itip.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/itip.py	2009-03-04 02:16:16 UTC (rev 3791)
+++ CalendarServer/trunk/twistedcaldav/scheduling/itip.py	2009-03-04 02:18:50 UTC (rev 3792)
@@ -33,7 +33,7 @@
 import datetime
 
 from twistedcaldav.config import config
-from twistedcaldav.dateops import normalizeToUTC
+from twistedcaldav.dateops import normalizeToUTC, toString
 from twistedcaldav.log import Logger
 from twistedcaldav.ical import Property, iCalendarProductID, Component
 
@@ -284,7 +284,7 @@
             attendees.add(attendee)
             partstat_changed = partstat_changed or partstat
             private_comment_changed = private_comment_changed or private_comment
-            if rids is not None:
+            if rids is not None and (partstat_changed or private_comment_changed):
                 rids.add("")
 
         # Now do all overridden ones
@@ -309,8 +309,8 @@
             attendees.add(attendee)
             partstat_changed = partstat_changed or partstat
             private_comment_changed = private_comment_changed or private_comment
-            if rids is not None:
-                rids.add(rid)
+            if rids is not None and (partstat_changed or private_comment_changed):
+                rids.add(toString(rid))
 
         return True, (attendees, partstat_changed, private_comment_changed, rids)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090303/af27b0c2/attachment.html>