Changeset 203 for trunk


Ignore:
Timestamp:
Oct 18, 2007, 10:58:34 PM (17 years ago)
Author:
ecprice
Message:

Fix to admin

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/web/templates/main.py

    r197 r203  
    132132    if user.username in (machine.administrator, machine.owner):
    133133        return True
    134     if getafsgroups.checkAfsGroup(user, machine.administrator, 'athena.mit.edu'): #XXX Cell?
     134    if getafsgroups.checkAfsGroup(user.username, machine.administrator, 'athena.mit.edu'): #XXX Cell?
     135        return True
     136    if getafsgroups.checkLockerOwner(user.username, machine.owner):
    135137        return True
    136138    return owns(user, machine)
     
    597599    if admin == user.username:
    598600        return admin
    599     if getafsgroups.checkAfsGroup(user, admin, 'athena.mit.edu'):
     601    if getafsgroups.checkAfsGroup(user.username, admin, 'athena.mit.edu'):
    600602        return admin
    601     if getafsgroups.checkAfsGroup(user, 'system:'+admin, 'athena.mit.edu'):
     603    if getafsgroups.checkAfsGroup(user.username, 'system:'+admin, 'athena.mit.edu'):
    602604        return 'system:'+admin
    603605    raise InvalidInput('admin', admin,
Note: See TracChangeset for help on using the changeset viewer.