sipb-xen-vnc-client -> invirt-vnc-client in invirt-web

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

diff --git a/code/webcommon.py b/code/webcommon.py
index eaf533c..0e3fd1d 100644 (file)
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -45,11 +45,11 @@ class State(object):
 
     def getMachines(self):
         if self.isadmin:
-            return Machine.query().join('acl').select_by(
-                database.or_(MachineAccess.c.user == self.username,
-                             Machine.c.adminable == True))
+            return Machine.query().join('acl').filter(
+                database.or_(MachineAccess.user==self.username,
+                             Machine.adminable==True))
         else:
-            return Machine.query().join('acl').select_by(user=self.username)
+            return Machine.query().join('acl').filter_by(user=self.username)
 
     machines = cachedproperty(getMachines)
     xmlist_raw = cachedproperty(lambda self: controls.getList())