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
point to ssh console in a paravm's info page
[invirt/packages/invirt-web.git]
/
code
/
validation.py
diff --git
a/code/validation.py
b/code/validation.py
index
fe6d7c8
..
513b431
100644
(file)
--- a/
code/validation.py
+++ b/
code/validation.py
@@
-44,9
+44,7
@@
class Validate:
owner = testOwner(username, owner, machine)
if owner is not None:
self.owner = owner
owner = testOwner(username, owner, machine)
if owner is not None:
self.owner = owner
- admin = testAdmin(username, admin, machine)
- if admin is not None:
- self.admin = admin
+ self.admin = testAdmin(username, admin, machine)
contact = testContact(username, contact, machine)
if contact is not None:
self.contact = contact
contact = testContact(username, contact, machine)
if contact is not None:
self.contact = contact
@@
-68,6
+66,8
@@
class Validate:
raise CodeError("Invalid cdrom type '%s'" % cdrom)
self.cdrom = cdrom
if autoinstall is not None:
raise CodeError("Invalid cdrom type '%s'" % cdrom)
self.cdrom = cdrom
if autoinstall is not None:
+ #raise InvalidInput('autoinstall', 'install',
+ # "The autoinstaller has been temporarily disabled")
self.autoinstall = Autoinstall.query().get(autoinstall)
self.autoinstall = Autoinstall.query().get(autoinstall)
@@
-218,7
+218,7
@@
def testAdmin(user, admin, machine):
if admin is None:
return None
if machine is not None and admin == machine.administrator:
if admin is None:
return None
if machine is not None and admin == machine.administrator:
- return None
+ return admin
if admin == user:
return admin
if ':' not in admin:
if admin == user:
return admin
if ':' not in admin: