[CalendarServer-changes] [2019] CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav

[source_changes at macosforge.org]

Revision: 2019
          http://trac.macosforge.org/projects/calendarserver/changeset/2019
Author:   wsanchez at apple.com
Date:     2007-11-15 12:11:30 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
Pulled up r2015 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/method/report_common.py
    CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/schedule.py

Modified: CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/method/report_common.py	2007-11-15 19:54:28 UTC (rev 2018)
+++ CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/method/report_common.py	2007-11-15 20:11:30 UTC (rev 2019)
@@ -567,7 +567,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.
@@ -576,6 +576,7 @@
     @param organizer: the L{Property} for the Organizer of the free busy request, or None.
     @param attendee:  the L{Property} for the Attendee responding to the free busy request, or None.
     @param uid:       the UID value from the free busy request.
+    @param method:    the METHOD property value to insert.
     @return:          the L{Component} containing the calendar data.
     """
     
@@ -587,6 +588,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/release/CalendarServer-1.1-dev/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/schedule.py	2007-11-15 19:54:28 UTC (rev 2018)
+++ CalendarServer/branches/release/CalendarServer-1.1-dev/twistedcaldav/schedule.py	2007-11-15 20:11:30 UTC (rev 2019)
@@ -438,7 +438,7 @@
                             matchtotal = matchtotal.getResult()
                     
                         # Build VFREEBUSY iTIP reply for this recipient
-                        fbresult = report_common.buildFreeBusyResult(fbinfo, timerange, organizer=organizerProp, attendee=attendeeProp, uid=uid)
+                        fbresult = report_common.buildFreeBusyResult(fbinfo, timerange, organizer=organizerProp, attendee=attendeeProp, uid=uid, method="REPLY")
 
                         responses.add(recipient, responsecode.OK, reqstatus="2.0;Success", calendar=fbresult)
                         recipients_state["OK"] += 1

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