rename overlord -> admin mode

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

diff --git a/code/main.py b/code/main.py
index bb863c1..42a456e 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -595,14 +595,15 @@ def unauthFront(_, _2, _3, fields):
     """Information for unauth'd users."""
     return templates.unauth(searchList=[{'simple' : True}])
 
     """Information for unauth'd users."""
     return templates.unauth(searchList=[{'simple' : True}])
 

-def overlord(username, state, path, fields):
+def admin(username, state, path, fields):

     if path == '':
         return ({'Status': '303 See Other',
     if path == '':
         return ({'Status': '303 See Other',

-                 'Location': 'overlord/'},
+                 'Location': 'admin/'},

                 "You shouldn't see this message.")
     if not username in getAfsGroupMembers('system:xvm', 'athena.mit.edu'):
                 "You shouldn't see this message.")
     if not username in getAfsGroupMembers('system:xvm', 'athena.mit.edu'):

-        raise InvalidInput('username', username, 'Not an overlord.')
-    newstate = State(username, overlord=True)
+        raise InvalidInput('username', username,
+                           'Not in admin group %s.' % 'system:xvm')
+    newstate = State(username, isadmin=True)

     newstate.environ = state.environ
     return handler(username, newstate, path, fields)
 
     newstate.environ = state.environ
     return handler(username, newstate, path, fields)
 

@@ -618,7 +619,7 @@ mapping = dict(list=listVms,
                create=create,
                help=helpHandler,
                unauth=unauthFront,
                create=create,
                help=helpHandler,
                unauth=unauthFront,

-               overlord=overlord,
+               admin=admin,

                errortest=throwError)
 
 def printHeaders(headers):
                errortest=throwError)
 
 def printHeaders(headers):