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)