Make the admin mode work - fix a SQLAlchemy 0.4-ism

svn path=/trunk/packages/sipb-xen-www/; revision=1169

diff --git a/code/webcommon.py b/code/webcommon.py
index 9052a4e..0e3fd1d 100644 (file)
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -45,9 +45,9 @@ class State(object):
 
     def getMachines(self):
         if self.isadmin:
 
     def getMachines(self):
         if self.isadmin:

-            return Machine.query().join('acl').filter_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').filter_by(user=self.username)
 
         else:
             return Machine.query().join('acl').filter_by(user=self.username)