X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/cfed63e6644aa489939f40a1ceff5b41e847aeca..4016733ded1999911d7e5f4df21ec66624d39c5c:/code/validation.py diff --git a/code/validation.py b/code/validation.py index fe6d7c8..ecd8b9f 100644 --- 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 - 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 @@ -218,7 +216,7 @@ def testAdmin(user, admin, machine): 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: