[CalendarServer-changes] [11094] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 11094
          http://trac.calendarserver.org//changeset/11094
Author:   sagen at apple.com
Date:     2013-04-23 13:58:45 -0700 (Tue, 23 Apr 2013)
Log Message:
-----------
Update webcal settings to reflect wiki server changes

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/platform/darwin/wiki.py
    CalendarServer/trunk/calendarserver/webcal/resource.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/platform/darwin/wiki.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/wiki.py	2013-04-23 19:49:27 UTC (rev 11093)
+++ CalendarServer/trunk/calendarserver/platform/darwin/wiki.py	2013-04-23 20:58:45 UTC (rev 11094)
@@ -48,7 +48,7 @@
             (jsonResponse, str(e)))
         raise WebAuthError("Could not look up token: %s" % (token,))
     if response["succeeded"]:
-        returnValue(response["shortname"])
+        returnValue(response["shortName"])
     else:
         raise WebAuthError("Could not look up token: %s" % (token,))
 

Modified: CalendarServer/trunk/calendarserver/webcal/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webcal/resource.py	2013-04-23 19:49:27 UTC (rev 11093)
+++ CalendarServer/trunk/calendarserver/webcal/resource.py	2013-04-23 20:58:45 UTC (rev 11094)
@@ -91,11 +91,11 @@
     def htmlContent(self, debug=False):
         if debug:
             cacheAttr = "_htmlContentDebug"
-            templateFileName = "debug_template.html"
+            templateFileName = "debug_standalone.html"
         else:
             cacheAttr = "_htmlContent"
-            templateFileName = "template.html"
-        templateFileName = os.path.join(config.WebCalendarRoot, "calendar", templateFileName)
+            templateFileName = "standalone.html"
+        templateFileName = os.path.join(config.WebCalendarRoot, templateFileName)
 
         #
         # See if the file changed, and dump the cached template if so.

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2013-04-23 19:49:27 UTC (rev 11093)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2013-04-23 20:58:45 UTC (rev 11094)
@@ -326,8 +326,8 @@
     "ConfigRoot"              : "Config",
     "LogRoot"                 : "/var/log/caldavd",
     "RunRoot"                 : "/var/run/caldavd",
-    "WebCalendarRoot"         : "/Applications/Server.app/Contents/ServerRoot/usr/share/collabd",
-
+    "WebCalendarRoot"         : "/Applications/Server.app/Contents/ServerRoot/usr/share/collabd/webcal/public",
+    
     #
     # Quotas
     #
@@ -432,7 +432,7 @@
         },
         "Wiki": {
             "Enabled": False,
-            "Cookie": "apple_webauth_token",
+            "Cookie": "cc.collabd_session_guid",
             "URL": "http://127.0.0.1:8089/RPC2",
             "UserMethod": "userForSession",
             "WikiMethod": "accessLevelForUserWikiCalendar",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130423/a6d41dfc/attachment.html>