[CalendarServer-changes] [14117] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14117
          http://trac.calendarserver.org//changeset/14117
Author:   cdaboo at apple.com
Date:     2014-10-28 19:33:08 -0700 (Tue, 28 Oct 2014)
Log Message:
-----------
Some travel related properties are actually URI values not DATE-TIME.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/__init__.py
    CalendarServer/trunk/twistedcaldav/ical.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/icaldiff.py

Modified: CalendarServer/trunk/twistedcaldav/__init__.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/__init__.py	2014-10-28 23:57:06 UTC (rev 14116)
+++ CalendarServer/trunk/twistedcaldav/__init__.py	2014-10-29 02:33:08 UTC (rev 14117)
@@ -68,6 +68,6 @@
 Property.registerDefaultValue("X-CALENDARSERVER-ATTENDEE-COMMENT", Value.VALUETYPE_TEXT)
 
 Property.registerDefaultValue("X-APPLE-TRAVEL-DURATION", Value.VALUETYPE_DURATION, always_write_value=True)
-Property.registerDefaultValue("X-APPLE-TRAVEL-START", Value.VALUETYPE_DATETIME, always_write_value=True)
+Property.registerDefaultValue("X-APPLE-TRAVEL-START", Value.VALUETYPE_URI, always_write_value=True)
 Property.registerDefaultValue("X-APPLE-TRAVEL-RETURN-DURATION", Value.VALUETYPE_DURATION, always_write_value=True)
-Property.registerDefaultValue("X-APPLE-TRAVEL-RETURN", Value.VALUETYPE_DATETIME, always_write_value=True)
+Property.registerDefaultValue("X-APPLE-TRAVEL-RETURN", Value.VALUETYPE_URI, always_write_value=True)

Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py	2014-10-28 23:57:06 UTC (rev 14116)
+++ CalendarServer/trunk/twistedcaldav/ical.py	2014-10-29 02:33:08 UTC (rev 14117)
@@ -3606,11 +3606,7 @@
                             instancerid = subcomponent.propertyValue("RECURRENCE-ID")
                             transp = subcomponent.propertyValue("TRANSP") == "TRANSPARENT"
                             adjusted_start = subcomponent.propertyValue("X-APPLE-TRAVEL-DURATION")
-                            if adjusted_start is None:
-                                adjusted_start = subcomponent.propertyValue("X-APPLE-TRAVEL-START")
                             adjusted_end = subcomponent.propertyValue("X-APPLE-TRAVEL-RETURN-DURATION")
-                            if adjusted_end is None:
-                                adjusted_end = subcomponent.propertyValue("X-APPLE-TRAVEL-RETURN")
                             self._perUserData.setdefault(uid, {})[instancerid] = (transp, adjusted_start, adjusted_end,)
                 elif component.name() not in ignoredComponents:
                     instancerid = component.propertyValue("RECURRENCE-ID")

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/icaldiff.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/icaldiff.py	2014-10-28 23:57:06 UTC (rev 14116)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/icaldiff.py	2014-10-29 02:33:08 UTC (rev 14117)
@@ -810,9 +810,7 @@
         "EXDATE",
         "STATUS",
         "TRANSP",
-        "X-APPLE-TRAVEL-START",
         "X-APPLE-TRAVEL-DURATION",
-        "X-APPLE-TRAVEL-RETURN",
         "X-APPLE-TRAVEL-RETURN-DURATION",
     ))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141028/1c4e17e7/attachment-0001.html>