X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/28157ee06739f2a56aa6f053024092796bf72f94..refs/heads/andersk:/code/webcommon.py?ds=sidebyside

diff --git a/code/webcommon.py b/code/webcommon.py
index b9a6287..0697a53 100644
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -25,9 +25,9 @@ class State(object):
 
     def getMachines(self):
         if self.isadmin:
-            return Machine.query().join('acl').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())