X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/874a30391973642d3ff350f977c1ac705644fbb0..7c8f43b416a8910eda4af95c7f66e410b95ce5b7:/code/webcommon.py?ds=sidebyside diff --git a/code/webcommon.py b/code/webcommon.py index eaf533c..9052a4e 100644 --- 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( + return Machine.query().join('acl').filter_by( database.or_(MachineAccess.c.user == self.username, Machine.c.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())