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

[source_changes at macosforge.org]

Revision: 1413
          http://trac.macosforge.org/projects/calendarserver/changeset/1413
Author:   wsanchez at apple.com
Date:     2007-03-22 15:15:10 -0700 (Thu, 22 Mar 2007)

Log Message:
-----------
dropbox and notifications properties should not exist if the cooresponding features are disabled.

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

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2007-03-22 22:14:31 UTC (rev 1412)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2007-03-22 22:15:10 UTC (rev 1413)
@@ -50,6 +50,7 @@
 
 import twistedcaldav
 from twistedcaldav import caldavxml, customxml
+from twistedcaldav.config import config
 from twistedcaldav.extensions import DAVResource, DAVPrincipalResource
 from twistedcaldav.icaldav import ICalDAVResource, ICalendarPrincipalResource
 from twistedcaldav.caldavxml import caldav_namespace
@@ -612,15 +613,14 @@
                         return caldavxml.ScheduleOutboxURL(davxml.HRef(url))
 
             elif namespace == calendarserver_namespace:
-                if name == "dropbox-home-URL":
+                if name == "dropbox-home-URL" and config.EnableDropBox:
                     url = self.dropboxURL()
                     if url is None:
                         return None
                     else:
                         return customxml.DropBoxHomeURL(davxml.HRef(url))
 
-                if name == "notifications-URL":
-                    # Use the first calendar home only
+                if name == "notifications-URL" and config.EnableNotifications:
                     url = self.notificationsURL()
                     if url is None:
                         return None

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070322/64ebc4e5/attachment.html