X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/66cccc3c93b4cd7d98c14564db63ee9831c4047e..8b2c8fa5de64487465829fee603e4c304ed9f9cc:/main.py

diff --git a/main.py b/main.py
index f567c71..7e7e23d 100755
--- a/main.py
+++ b/main.py
@@ -36,7 +36,7 @@ sys.path.append('/home/ecprice/.local/lib/python2.5/site-packages')
 
 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
 import controls
@@ -183,8 +183,7 @@ def create(user, fields):
 
 
 def getListDict(user):
-    machines = [m for m in Machine.select()
-                if validation.haveAccess(user, m)]
+    machines = g.machines
     checkpoint.checkpoint('Got my machines')
     on = {}
     has_vnc = {}
@@ -327,8 +326,8 @@ def command(user, fields):
     except InvalidInput, err:
         if not back:
             raise
-        print >> sys.stderr, err
-        result = None
+        #print >> sys.stderr, err
+        result = err
     else:
         result = 'Success!'
         if not back:
@@ -344,8 +343,7 @@ def command(user, fields):
         d['result'] = result
         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):
     olddisk = {}