Fixes for queries on cherrypy compat

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

diff --git a/code/webcommon.py b/code/webcommon.py
index b9a6287..0697a53 100644 (file)
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -25,9 +25,9 @@ class State(object):
 
     def getMachines(self):
         if self.isadmin:
 
     def getMachines(self):
         if self.isadmin:

-            return Machine.query().join('acl').all()
+            return Machine.query.all()

         else:
         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())
 
     machines = cachedproperty(getMachines)
     xmlist_raw = cachedproperty(lambda self: controls.getList())