Get username and state from CherryPy request

[invirt/packages/invirt-web.git] / code / main.py

diff --git a/code/main.py b/code/main.py
index 0a9342a..fd95e84 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -55,12 +55,12 @@ class InvirtWeb(View):
 
     @cherrypy.expose
     @cherrypy.tools.mako(filename="/list.mako")
 
     @cherrypy.expose
     @cherrypy.tools.mako(filename="/list.mako")

-    def list(self, username):
+    def list(self):

         """Handler for list requests."""
         checkpoint.checkpoint('Getting list dict')
         """Handler for list requests."""
         checkpoint.checkpoint('Getting list dict')

-        d = getListDict(username, state)
+        d = getListDict(cherrypy.request.login, cherrypy.request.state)

         checkpoint.checkpoint('Got list dict')
         checkpoint.checkpoint('Got list dict')

-        return templates.list(searchList=[d])
+        return d

     index=list
 
     @cherrypy.expose
     index=list
 
     @cherrypy.expose