[CalendarServer-changes] [8561] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 8561
          http://trac.macosforge.org/projects/calendarserver/changeset/8561
Author:   sagen at apple.com
Date:     2012-01-19 11:45:22 -0800 (Thu, 19 Jan 2012)
Log Message:
-----------
Make host/port configurable for accessForUserToWiki

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py
    CalendarServer/trunk/twistedcaldav/directory/wiki.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py	2012-01-19 19:39:34 UTC (rev 8560)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py	2012-01-19 19:45:22 UTC (rev 8561)
@@ -86,16 +86,16 @@
         """
         self.patch(config.Authentication.Wiki, "LionCompatibility", False)
 
-        def successful(user, wiki):
+        def successful(user, wiki, host=None, port=None):
             return succeed("read")
 
-        def forbidden(user, wiki):
+        def forbidden(user, wiki, host=None, port=None):
             raise WebError(403, message="Unknown user")
 
-        def notFound(user, wiki):
+        def notFound(user, wiki, host=None, port=None):
             raise WebError(404, message="Non-existent wiki")
 
-        def other(user, wiki):
+        def other(user, wiki, host=None, port=None):
             raise WebError(500, "Error")
 
         access = (yield getWikiAccess("user", "wiki", method=successful))

Modified: CalendarServer/trunk/twistedcaldav/directory/wiki.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/wiki.py	2012-01-19 19:39:34 UTC (rev 8560)
+++ CalendarServer/trunk/twistedcaldav/directory/wiki.py	2012-01-19 19:45:22 UTC (rev 8561)
@@ -146,7 +146,8 @@
             access = (yield method(wikiConfig["WikiMethod"],
                 userID, wikiID))
         else:
-            access = (yield method(userID, wikiID))
+            access = (yield method(userID, wikiID,
+                host=wikiConfig.CollabHost, port=wikiConfig.CollabPort))
 
         log.debug("Wiki ACL result: user [%s], wiki [%s], access [%s]" %
             (userID, wikiID, access))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120119/9c3c0a56/attachment.html>