Changeset 2411 for package_branches/invirt-web/cherrypy

Timestamp:

Aug 9, 2009, 6:45:35 PM (15 years ago)

Author:

quentin

Message:

Upgrade info page to Mako

Location:

package_branches/invirt-web/cherrypy/code

Files:

• main.py (modified) (3 diffs)
• templates/info.mako (added)
• templates/info.tmpl (deleted)

package_branches/invirt-web/cherrypy/code/main.py

@@ -66 +66 @@
         return d
     index=list
+
+    @cherrypy.expose
+    @cherrypy.tools.mako(filename="/info.mako")
+    def info(self, machine_id):
+        """Handler for info on a single VM."""
+        machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine
+        d = infoDict(cherrypy.request.login, cherrypy.request.state, machine)
+        checkpoint.checkpoint('Got infodict')
+        return d
 
     @cherrypy.expose
@@ -606 +615 @@
     return d
 
-def info(username, state, path, fields):
-    """Handler for info on a single VM."""
-    machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
-    d = infoDict(username, state, machine)
-    checkpoint.checkpoint('Got infodict')
-    return templates.info(searchList=[d])
-
 def unauthFront(_, _2, _3, fields):
     """Information for unauth'd users."""
@@ -637 +639 @@
                command=command,
                modify=modify,
-               info=info,
                create=create,
                unauth=unauthFront,