Changeset 261 for trunk/web/main.py

Timestamp:

Jan 24, 2008, 9:34:53 PM (16 years ago)

Author:

ecprice

Message:

Use cached ACLs

File:

• trunk/web/main.py (modified) (4 diffs)

trunk/web/main.py

@@ -37 +37 @@
 import templates
 from Cheetah.Template import Template
-from sipb_xen_database import Machine, CDROM, ctx, connect
+from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess
 import validation
 from webcommon import InvalidInput, CodeError, g
@@ -184 +184 @@
 
 def getListDict(user):
-    machines = [m for m in Machine.select()
-                if validation.haveAccess(user, m)]
+    machines = g.machines
     checkpoint.checkpoint('Got my machines')
     on = {}
@@ -328 +327 @@
         if not back:
             raise
-        print >> sys.stderr, err
-        result = None
+        #print >> sys.stderr, err
+        result = err
     else:
         result = 'Success!'
@@ -345 +344 @@
         return templates.info(searchList=[d])
     else:
-        raise InvalidInput
-    ('back', back, 'Not a known back page.')
+        raise InvalidInput('back', back, 'Not a known back page.')
 
 def modifyDict(user, fields):