[CalendarServer-changes] [1877] CalendarServer/branches/users/cdaboo/server2server-1842/ twistedcaldav

[source_changes at macosforge.org]

Revision: 1877
          http://trac.macosforge.org/projects/calendarserver/changeset/1877
Author:   cdaboo at apple.com
Date:     2007-09-17 14:35:54 -0700 (Mon, 17 Sep 2007)

Log Message:
-----------
Make sure iTIP VFREEBUSY REPLY's contain the correct METHOD property.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/method/report_common.py
    CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/schedule_common.py

Modified: CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/method/report_common.py	2007-09-17 15:40:41 UTC (rev 1876)
+++ CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/method/report_common.py	2007-09-17 21:35:54 UTC (rev 1877)
@@ -573,7 +573,7 @@
     normalizePeriodList(periods)
     return periods
 
-def buildFreeBusyResult(fbinfo, timerange, organizer=None, attendee=None, uid=None):
+def buildFreeBusyResult(fbinfo, timerange, organizer=None, attendee=None, uid=None, method=None):
     """
     Generate a VCALENDAR object containing a single VFREEBUSY that is the
     aggregate of the free busy info passed in.
@@ -593,6 +593,8 @@
     # Now build a new calendar object with the free busy info we have
     fbcalendar = Component("VCALENDAR")
     fbcalendar.addProperty(Property("PRODID", iCalendarProductID))
+    if method:
+        fbcalendar.addProperty(Property("METHOD", method))
     fb = Component("VFREEBUSY")
     fbcalendar.addComponent(fb)
     if organizer is not None:

Modified: CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/schedule_common.py
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/schedule_common.py	2007-09-17 15:40:41 UTC (rev 1876)
+++ CalendarServer/branches/users/cdaboo/server2server-1842/twistedcaldav/schedule_common.py	2007-09-17 21:35:54 UTC (rev 1877)
@@ -531,7 +531,7 @@
             matchtotal = matchtotal.getResult()
     
         # Build VFREEBUSY iTIP reply for this recipient
-        fbresult = report_common.buildFreeBusyResult(fbinfo, self.timerange, organizer=organizerProp, attendee=attendeeProp, uid=uid)
+        fbresult = report_common.buildFreeBusyResult(fbinfo, self.timerange, organizer=organizerProp, attendee=attendeeProp, uid=uid, method="REPLY")
 
         yield fbresult
     

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070917/ec0614aa/attachment.html