Changeset 1709

Timestamp:

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

Author:

broder

Message:

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

Location:

trunk/packages/invirt-web/code

Files:

• cache_acls.py (modified) (1 diff)
• controls.py (modified) (1 diff)
• validation.py (modified) (2 diffs)

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

@@ -43 +43 @@
     people = set()
     people.update(expandLocker(m.owner))
-    people.update(expandName(m.administrator))
+    if m.administrator is not None:
+        people.update(expandName(m.administrator))
     return people
 

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

@@ -91 +91 @@
         machine.memory = memory
         machine.owner = owner
-        machine.administrator = owner
+        machine.administrator = None
         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())

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