[CalendarServer-changes] [6135] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 6135
          http://trac.macosforge.org/projects/calendarserver/changeset/6135
Author:   sagen at apple.com
Date:     2010-08-19 13:15:39 -0700 (Thu, 19 Aug 2010)
Log Message:
-----------
Honor the EnableSearchAddressBook plist key (temporarily until the admin tool starts using DirectoryAddressBook > Enabled)

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/util.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2010-08-19 18:47:45 UTC (rev 6134)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2010-08-19 20:15:39 UTC (rev 6135)
@@ -318,7 +318,7 @@
         )
 
         directoryPath = os.path.join(config.DocumentRoot, config.DirectoryAddressBook.name)
-        if config.DirectoryAddressBook.Enabled:
+        if config.DirectoryAddressBook.Enabled and config.EnableSearchAddressBook:
             log.info("Setting up directory address book: %r" % (directoryBackedAddressBookResourceClass,))
 
             directoryBackedAddressBookCollection = directoryBackedAddressBookResourceClass(
@@ -351,7 +351,7 @@
         root.putChild("calendars", calendarCollection)
     if config.EnableCardDAV:
         root.putChild('addressbooks', addressBookCollection)
-        if config.DirectoryAddressBook.Enabled:
+        if config.DirectoryAddressBook.Enabled and config.EnableSearchAddressBook:
             root.putChild(config.DirectoryAddressBook.name, directoryBackedAddressBookCollection)
 
     # /.well-known

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-08-19 18:47:45 UTC (rev 6134)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-08-19 20:15:39 UTC (rev 6135)
@@ -356,6 +356,7 @@
         "name":    "directory",
         "MaxQueryResults": 1000,
     },
+    "EnableSearchAddressBook": True, # /directory resource exists
     "AnonymousDirectoryAddressBookAccess": False, # Anonymous users may access directory address book
 
     "GlobalAddressBook": {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100819/7bc27a1b/attachment.html>