[CalendarServer-changes] [5119] CalendarServer/trunk/twistedcaldav/resource.py

[source_changes at macosforge.org]

Revision: 5119
          http://trac.macosforge.org/projects/calendarserver/changeset/5119
Author:   cdaboo at apple.com
Date:     2010-02-15 11:18:24 -0800 (Mon, 15 Feb 2010)
Log Message:
-----------
Contacts merge fix.

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

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2010-02-15 16:25:26 UTC (rev 5118)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2010-02-15 19:18:24 UTC (rev 5119)
@@ -999,16 +999,17 @@
                 returnValue(customxml.CalendarProxyWriteFor(
                     *[davxml.HRef(principal.principalURL()) for principal in results]
                 ))
+
+            elif name == "auto-schedule":
+                autoSchedule = self.getAutoSchedule()
+                returnValue(customxml.AutoSchedule("true" if autoSchedule else "false"))
+
         elif config.EnableCardDAV and namespace == carddav_namespace:
             if name == "addressbook-home-set":
                 returnValue(carddavxml.AddressBookHomeSet(
                     *[davxml.HRef(url) for url in self.addressBookHomeURLs()]
                  ))
 
-            elif name == "auto-schedule":
-                autoSchedule = self.getAutoSchedule()
-                returnValue(customxml.AutoSchedule("true" if autoSchedule else "false"))
-
         result = (yield super(CalendarPrincipalResource, self).readProperty(property, request))
         returnValue(result)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100215/63e1a37e/attachment-0001.html>