projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug resulting from partial uptimes list from r261
[invirt/packages/invirt-web.git]
/
main.py
diff --git
a/main.py
b/main.py
index
f567c71
..
a3c84ee
100755
(executable)
--- 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
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
import validation
from webcommon import InvalidInput, CodeError, g
import controls
@@
-146,10
+146,10
@@
def parseCreate(user, fields):
owner = validation.testOwner(user, fields.getfirst('owner'))
memory = fields.getfirst('memory')
owner = validation.testOwner(user, fields.getfirst('owner'))
memory = fields.getfirst('memory')
- memory = validation.validMemory(user, memory, on=True)
+ memory = validation.validMemory(owner, memory, on=True)
disk_size = fields.getfirst('disk')
disk_size = fields.getfirst('disk')
- disk_size = validation.validDisk(user, disk_size)
+ disk_size = validation.validDisk(owner, disk_size)
vm_type = fields.getfirst('vmtype')
if vm_type not in ('hvm', 'paravm'):
vm_type = fields.getfirst('vmtype')
if vm_type not in ('hvm', 'paravm'):
@@
-183,8
+183,7
@@
def create(user, fields):
def getListDict(user):
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 = {}
checkpoint.checkpoint('Got my machines')
on = {}
has_vnc = {}
@@
-327,8
+326,8
@@
def command(user, fields):
except InvalidInput, err:
if not back:
raise
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:
else:
result = 'Success!'
if not back:
@@
-344,8
+343,7
@@
def command(user, fields):
d['result'] = result
return templates.info(searchList=[d])
else:
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 = {}
def modifyDict(user, fields):
olddisk = {}