[CalendarServer-changes] [7261] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 7261
          http://trac.macosforge.org/projects/calendarserver/changeset/7261
Author:   cdaboo at apple.com
Date:     2011-03-24 15:34:58 -0700 (Thu, 24 Mar 2011)
Log Message:
-----------
Fix report expand behavior.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/datafilters/calendardata.py
    CalendarServer/trunk/twistedcaldav/ical.py

Modified: CalendarServer/trunk/twistedcaldav/datafilters/calendardata.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/datafilters/calendardata.py	2011-03-24 22:34:20 UTC (rev 7260)
+++ CalendarServer/trunk/twistedcaldav/datafilters/calendardata.py	2011-03-24 22:34:58 UTC (rev 7261)
@@ -59,20 +59,19 @@
         # Make sure input is valid
         ical = self.validCalendar(ical)
 
-        # Pre-process the calendar data based on expand and limit options
+        # Process the calendar data based on expand and limit options
         if self.calendardata.freebusy_set:
             ical = self.limitFreeBusy(ical)
-
-        # Filter data based on any provided CALDAV:comp element, or use all current data
-        if self.calendardata.component is not None:
-            ical = self.compFilter(self.calendardata.component, ical)
         
-        # Post-process the calendar data based on the expand and limit options
         if self.calendardata.recurrence_set:
             if isinstance(self.calendardata.recurrence_set, LimitRecurrenceSet):
                 ical = self.limitRecurrence(ical)
             elif isinstance(self.calendardata.recurrence_set, Expand):
                 ical = self.expandRecurrence(ical, self.timezone)
+
+        # Filter data based on any provided CALDAV:comp element, or use all current data
+        if self.calendardata.component is not None:
+            ical = self.compFilter(self.calendardata.component, ical)
         
         return ical
 

Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py	2011-03-24 22:34:20 UTC (rev 7260)
+++ CalendarServer/trunk/twistedcaldav/ical.py	2011-03-24 22:34:58 UTC (rev 7261)
@@ -898,6 +898,7 @@
         for property in newcomp.properties():
             value = property.value()
             if isinstance(value, PyCalendarDateTime) and value.local():
+                property.removeParameter("TZID")
                 property.setValue(value.duplicateAsUTC())
         
         # Now reset DTSTART, DTEND/DURATION
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110324/18753342/attachment.html>