[CalendarServer-changes] [2015] CalendarServer/trunk/twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Thu Nov 15 11:41:41 PST 2007
Revision: 2015
http://trac.macosforge.org/projects/calendarserver/changeset/2015
Author: cdaboo at apple.com
Date: 2007-11-15 11:41:40 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Make sure METHOD:REPLY appears in iTIP free-busy lookup responses, but not in free-busy-query report results.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/method/report_common.py
CalendarServer/trunk/twistedcaldav/schedule.py
Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_common.py 2007-11-15 19:40:41 UTC (rev 2014)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py 2007-11-15 19:41:40 UTC (rev 2015)
@@ -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/trunk/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/schedule.py 2007-11-15 19:40:41 UTC (rev 2014)
+++ CalendarServer/trunk/twistedcaldav/schedule.py 2007-11-15 19:41:40 UTC (rev 2015)
@@ -439,7 +439,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/b8bc51ec/attachment.html
More information about the calendarserver-changes
mailing list