Attempt to get Apache and OpenAFS to start in the right order

[invirt/packages/invirt-web.git] / code / webcommon.py

diff --git a/code/webcommon.py b/code/webcommon.py
index 0449046..9052a4e 100644 (file)
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -1,6 +1,7 @@
 """Exceptions for the web interface."""
 
 import time
 """Exceptions for the web interface."""
 
 import time

+from invirt import database

 from invirt.database import Machine, MachineAccess
 
 class MyException(Exception):
 from invirt.database import Machine, MachineAccess
 
 class MyException(Exception):

@@ -38,15 +39,17 @@ def cachedproperty(func):
 
 class State(object):
     """State for a request"""
 
 class State(object):
     """State for a request"""

-    def __init__(self, user, overlord=False):
+    def __init__(self, user, isadmin=False):

         self.username = user
         self.username = user

-        self.overlord = overlord
+        self.isadmin = isadmin

 
     def getMachines(self):
 
     def getMachines(self):

-        if self.overlord:
-            return Machine.select()
+        if self.isadmin:
+            return Machine.query().join('acl').filter_by(
+                database.or_(MachineAccess.c.user == self.username,
+                             Machine.c.adminable == True))

         else:
         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())
 
     machines = cachedproperty(getMachines)
     xmlist_raw = cachedproperty(lambda self: controls.getList())