[CalendarServer-changes] [7815] CalendarServer/trunk/twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jul 20 13:00:05 PDT 2011
Revision: 7815
http://trac.macosforge.org/projects/calendarserver/changeset/7815
Author: cdaboo at apple.com
Date: 2011-07-20 13:00:05 -0700 (Wed, 20 Jul 2011)
Log Message:
-----------
Make sure that expand correctly includes RECURRENCE-ID in expanded instances.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/ical.py
CalendarServer/trunk/twistedcaldav/instance.py
Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py 2011-07-20 19:59:28 UTC (rev 7814)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2011-07-20 20:00:05 UTC (rev 7815)
@@ -963,8 +963,8 @@
for property in newcomp.properties("DURATION"):
property.setValue(instance.end - instance.start)
- # Add RECURRENCE-ID if not first instance
- if not first:
+ # Add RECURRENCE-ID if not master instance
+ if not instance.isMasterInstance():
newcomp.addProperty(Property("RECURRENCE-ID", instance.rid))
return newcomp
Modified: CalendarServer/trunk/twistedcaldav/instance.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/instance.py 2011-07-20 19:59:28 UTC (rev 7814)
+++ CalendarServer/trunk/twistedcaldav/instance.py 2011-07-20 20:00:05 UTC (rev 7815)
@@ -83,6 +83,9 @@
return triggers
+ def isMasterInstance(self):
+ return not self.overridden and self.start == self.component.getStartDateUTC()
+
class InstanceList(object):
def __init__(self, ignoreInvalidInstances=False):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110720/2a18bfc9/attachment.html>
More information about the calendarserver-changes
mailing list