[CalendarServer-changes] [9889] CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/ scheduling/ischedule/resource.py

[source_changes at macosforge.org]

Revision: 9889
          http://trac.calendarserver.org//changeset/9889
Author:   cdaboo at apple.com
Date:     2012-10-03 02:50:32 -0700 (Wed, 03 Oct 2012)
Log Message:
-----------
Change query param name, no children.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/resource.py

Modified: CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/resource.py
===================================================================
--- CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/resource.py	2012-10-03 09:44:57 UTC (rev 9888)
+++ CalendarServer/branches/users/cdaboo/ischedule-dkim/twistedcaldav/scheduling/ischedule/resource.py	2012-10-03 09:50:32 UTC (rev 9889)
@@ -23,7 +23,8 @@
 from twisted.internet.defer import succeed, returnValue, inlineCallbacks
 from twistedcaldav import caldavxml
 from twistedcaldav.config import config
-from twistedcaldav.extensions import DAVResource
+from twistedcaldav.extensions import DAVResource, \
+    DAVResourceWithoutChildrenMixin
 from twistedcaldav.resource import ReadOnlyNoCopyResourceMixIn
 from twistedcaldav.scheduling.caldav.resource import deliverSchedulePrivilegeSet
 from twistedcaldav.scheduling.ischedule.scheduler import IScheduleScheduler
@@ -34,7 +35,7 @@
     "IScheduleInboxResource",
 ]
 
-class IScheduleInboxResource (ReadOnlyNoCopyResourceMixIn, DAVResource):
+class IScheduleInboxResource (ReadOnlyNoCopyResourceMixIn, DAVResourceWithoutChildrenMixin, DAVResource):
     """
     iSchedule Inbox resource.
 
@@ -119,25 +120,25 @@
             # Do normal GET behavior
             return self.render(request)
 
-        query = request.args.get("query", ("",))
-        if len(query) != 1:
+        action = request.args.get("action", ("",))
+        if len(action) != 1:
             raise HTTPError(StatusResponse(
                 responsecode.BAD_REQUEST,
-                "Invalid query parameter",
+                "Invalid action parameter",
             ))
-        query = query[0]
+        action = action[0]
 
-        query = {
+        action = {
             "capabilities"  : self.doCapabilities,
-        }.get(query, None)
+        }.get(action, None)
 
-        if query is None:
+        if action is None:
             raise HTTPError(StatusResponse(
                 responsecode.BAD_REQUEST,
-                "Unknown query query parameter",
+                "Unknown action action parameter",
             ))
 
-        return query(request)
+        return action(request)
 
 
     def doCapabilities(self, request):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121003/95b29891/attachment.html>