Fixes for queries on cherrypy compat

diff --git a/code/main.py b/code/main.py
index e5722fa..b443640 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -286,7 +286,7 @@ console will suffer artifacts.
                                           machine_id=machine_id).machine
             d = infoDict(cherrypy.request.login, cherrypy.request.state, machine)
             return d
-        index = info
+        index = list
 
         @cherrypy.expose
         @cherrypy.tools.mako(filename="/info.mako")

diff --git a/code/webcommon.py b/code/webcommon.py
index 7410523..0697a53 100644 (file)
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -25,9 +25,9 @@ class State(object):
 
     def getMachines(self):
         if self.isadmin:
-            return Machine.query().all()
+            return Machine.query.all()
         else:
-            return Machine.query().join('acl').filter_by(user=self.username)
+            return Machine.query.join('acl').filter_by(user=self.username)
 
     machines = cachedproperty(getMachines)
     xmlist_raw = cachedproperty(lambda self: controls.getList())