[CalendarServer-changes] [1412] CalendarServer/trunk/twistedcaldav/directory/principal.py

[source_changes at macosforge.org]

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

Log Message:
-----------
dropboxURL() and notificationsURL() should return None if the cooresponding features are disabled.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-03-21 18:54:02 UTC (rev 1411)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-03-22 22:14:31 UTC (rev 1412)
@@ -477,10 +477,16 @@
         return self._homeChildURL("outbox/")
 
     def dropboxURL(self):
-        return self._homeChildURL("dropbox/")
+        if config.EnableDropBox:
+            return self._homeChildURL("dropbox/")
+        else:
+            return None
 
     def notificationsURL(self):
-        return self._homeChildURL("notifications/")
+        if config.EnableNotifications:
+            return self._homeChildURL("notifications/")
+        else:
+            return None
 
     def _homeChildURL(self, name):
         home = self._calendarHome()

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