[CalendarServer-changes] [3813] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3813
          http://trac.macosforge.org/projects/calendarserver/changeset/3813
Author:   cdaboo at apple.com
Date:     2009-03-11 09:56:36 -0700 (Wed, 11 Mar 2009)
Log Message:
-----------
Make sure missing default calendar property is handled properly. Remove unneeded default calendar config option.

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/twistedcaldav/config.py
    CalendarServer/trunk/twistedcaldav/directory/calendar.py
    CalendarServer/trunk/twistedcaldav/schedule.py

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2009-03-11 15:17:50 UTC (rev 3812)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2009-03-11 16:56:36 UTC (rev 3813)
@@ -505,8 +505,6 @@
         <true/>
         <key>ScheduleTagCompatibility</key>
         <true/>
-        <key>DefaultCalendarProvisioned</key>
-        <true/>
         <key>EnablePrivateComments</key>
         <true/>
       </dict>

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2009-03-11 15:17:50 UTC (rev 3812)
+++ CalendarServer/trunk/twistedcaldav/config.py	2009-03-11 16:56:36 UTC (rev 3813)
@@ -246,7 +246,6 @@
             "AddressPatterns"            : [],    # Reg-ex patterns to match local calendar user addresses
             "OldDraftCompatibility"      : True,  # Whether to maintain compatibility with non-implicit mode
             "ScheduleTagCompatibility"   : True,  # Whether to support older clients that do not use Schedule-Tag feature
-            "DefaultCalendarProvisioned" : True,  # Whether the provisioned default calendar is marked as the scheduling default
             "EnablePrivateComments"      : True,  # Private comments from attendees to organizer
         },
 

Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendar.py	2009-03-11 15:17:50 UTC (rev 3812)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py	2009-03-11 16:56:36 UTC (rev 3813)
@@ -301,9 +301,8 @@
             inbox.provision()
             inbox.processFreeBusyCalendar(childURL, True)
 
-            # Default calendar may need to be marked as the default for scheduling
-            if config.Scheduling.CalDAV.DefaultCalendarProvisioned:
-                inbox.writeDeadProperty(caldavxml.ScheduleDefaultCalendarURL(davxml.HRef(childURL)))
+            # Default calendar is marked as the default for scheduling
+            inbox.writeDeadProperty(caldavxml.ScheduleDefaultCalendarURL(davxml.HRef(childURL)))
 
             return self
 

Modified: CalendarServer/trunk/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/schedule.py	2009-03-11 15:17:50 UTC (rev 3812)
+++ CalendarServer/trunk/twistedcaldav/schedule.py	2009-03-11 16:56:36 UTC (rev 3813)
@@ -118,7 +118,10 @@
                 returnValue(caldavxml.CalendarFreeBusySet())
         elif qname == (caldav_namespace, "schedule-default-calendar-URL"):
             # Must have a valid default
-            defaultCalendarProperty = self.readDeadProperty(property)
+            try:
+                defaultCalendarProperty = self.readDeadProperty(property)
+            except HTTPError:
+                defaultCalendarProperty = None
             if defaultCalendarProperty and len(defaultCalendarProperty.children) == 1:
                 defaultCalendar = str(defaultCalendarProperty.children[0])
                 cal = (yield request.locateResource(str(defaultCalendar)))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090311/e6000e0c/attachment.html>