Changeset 1709 for trunk/packages


Ignore:
Timestamp:
Nov 17, 2008, 2:08:04 PM (16 years ago)
Author:
broder
Message:

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

Location:
trunk/packages/invirt-web/code
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r1318 r1709  
    4343    people = set()
    4444    people.update(expandLocker(m.owner))
    45     people.update(expandName(m.administrator))
     45    if m.administrator is not None:
     46        people.update(expandName(m.administrator))
    4647    return people
    4748

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

    r1695 r1709  
    9191        machine.memory = memory
    9292        machine.owner = owner
    93         machine.administrator = owner
     93        machine.administrator = None
    9494        machine.contact = contact
    9595        machine.uuid = uuidToString(randomUUID())

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

    r1612 r1709  
    4545        if owner is not None:
    4646            self.owner = owner
    47         admin = testAdmin(username, admin, machine)
    48         if admin is not None:
    49             self.admin = admin
     47        self.admin = testAdmin(username, admin, machine)
    5048        contact = testContact(username, contact, machine)
    5149        if contact is not None:
    … …  
    219217        return None
    220218    if machine is not None and admin == machine.administrator:
    221         return None
     219        return admin
    222220    if admin == user:
    223221        return admin
Note: See TracChangeset for help on using the changeset viewer.