Changeset 1709 for trunk/packages/invirt-web/code/validation.py

Timestamp:

Nov 17, 2008, 2:08:04 PM (15 years ago)

Author:

broder

Message:

Default to a NULL administrator, instead of the same as the owner

File:

• trunk/packages/invirt-web/code/validation.py (modified) (2 diffs)

trunk/packages/invirt-web/code/validation.py

@@ -45 +45 @@
         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:
@@ -219 +217 @@
         return None
     if machine is not None and admin == machine.administrator:
-        return None
+        return admin
     if admin == user:
         return admin