crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix machine appartements et gest_crans_lc

Browse source
This commit is contained in:
Gabriel Detraz 2015-11-19 02:30:14 +01:00
parent 77ca50c48c
commit e16ff77675
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gestion/dialog/machine.py
View file

@ -263,18 +263,26 @@ class Dialog(certificat.Dialog, blacklist.Dialog):
menu_droits = { menu_droits = {
'Fixe' : [a.soi, a.cableur, a.nounou], 'Fixe' : [a.soi, a.cableur, a.nounou],
'Wifi' : [a.soi, a.cableur, a.nounou], 'Wifi' : [a.soi, a.cableur, a.nounou],
'Appartements': [a.soi, a.cableur, a.nounou],
} }
menu = { menu = {
'Fixe' : {'text' : "Machine filaire", 'objectClass':'machineFixe', 'realm':'adherents'}, 'Fixe' : {'text' : "Machine filaire", 'objectClass':'machineFixe', 'realm':'adherents'},
'Appartements' : {'text' : "Machine filaire de personnel ENS", 'objectClass':'machineFixe', 'realm':'personnel-ens'},
'Wifi' : {'text': 'Machine sans fil', 'objectClass':'machineWifi', 'realm':'wifi-adh'}, 'Wifi' : {'text': 'Machine sans fil', 'objectClass':'machineWifi', 'realm':'wifi-adh'},
} }
menu_order = ['Wifi','Fixe'] menu_order = ['Wifi']
if not bool(proprio.get('droits', False)) and isinstance(proprio, objets.adherent): # Machine appartement pour les personnels, fixe pour les autres
for machine in proprio.machines(): if proprio.get('etudes', [False])[0] == u'Personnel ENS':
if isinstance(machine, objets.machineFixe): menu_order.append('Appartements')
menu_order.remove('Fixe') else:
break # On vérifie que un non MA a qu'une machine fixe
menu_order.append('Fixe')
if not bool(proprio.get('droits', False)) and isinstance(proprio, objets.adherent):
for machine in proprio.machines():
if isinstance(machine, objets.machineFixe):
menu_order.remove('Fixe')
break
if isinstance(proprio, objets.AssociationCrans): if isinstance(proprio, objets.AssociationCrans):
menu_droits.update({ menu_droits.update({