X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/7ab93691b4b6a45e99f78b37796413c5f24629a4..2be4309141ec57fc2b2a7b776b2187cd38d6abb7:/code/webcommon.py?ds=sidebyside

diff --git a/code/webcommon.py b/code/webcommon.py
index 0449046..0e3fd1d 100644
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -1,6 +1,7 @@
 """Exceptions for the web interface."""
 
 import time
+from invirt import database
 from invirt.database import Machine, MachineAccess
 
 class MyException(Exception):
@@ -38,15 +39,17 @@ def cachedproperty(func):
 
 class State(object):
     """State for a request"""
-    def __init__(self, user, overlord=False):
+    def __init__(self, user, isadmin=False):
         self.username = user
-        self.overlord = overlord
+        self.isadmin = isadmin
 
     def getMachines(self):
-        if self.overlord:
-            return Machine.select()
+        if self.isadmin:
+            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())