Changeset 1169

Timestamp:

Oct 22, 2008, 10:01:04 PM (16 years ago)

Author:

broder

Message:

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

File:

• trunk/packages/sipb-xen-www/code/webcommon.py (modified) (1 diff)

trunk/packages/sipb-xen-www/code/webcommon.py

@@ -46 +46 @@
     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)