[CalendarServer-changes] [9770] CalendarServer/trunk/twistedcaldav/instance.py

[source_changes at macosforge.org]

Revision: 9770
          http://trac.macosforge.org/projects/calendarserver/changeset/9770
Author:   cdaboo at apple.com
Date:     2012-09-04 12:39:35 -0700 (Tue, 04 Sep 2012)
Log Message:
-----------
Fix query+expand where recurrence instance is overridden to move into expand time-range.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/instance.py

Modified: CalendarServer/trunk/twistedcaldav/instance.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/instance.py	2012-09-04 19:38:48 UTC (rev 9769)
+++ CalendarServer/trunk/twistedcaldav/instance.py	2012-09-04 19:39:35 UTC (rev 9770)
@@ -351,7 +351,7 @@
 
         # Make sure override RECURRENCE-ID is a valid instance of the master
         if got_master:
-            if str(rid) not in self.instances and rid < upperlimit:
+            if str(rid) not in self.instances and rid < upperlimit and (lowerLimit is None or rid >= lowerLimit):
                 if self.ignoreInvalidInstances:
                     return
                 else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120904/350b69cd/attachment-0001.html>