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

Plus d'invits.

Browse source 
darcs-hash:20060323150946-68412-e53639e21442ce0cd6006e8eff8cb521344eb9a8.gz
This commit is contained in:
glondu 2006-03-23 16:09:46 +01:00
parent bfed30d32a
commit 1c7207577b
7 changed files with 11 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gestion/ldap_crans.py
View file

@ -804,8 +804,6 @@ class crans_ldap:
if graphic: cprint('Lecture base LDAP', 'gras')
# Machines de l'assoce
self.__machines = crans(self.conn).machines()
# Machines des invités
self.__machines += Invite(self.conn).machines()
# Machines des adhérents et clubs de l'année en cours
base = self.search('paiement=ok')
base = base['adherent'] + base['club']
@ -2198,7 +2196,7 @@ class Machine(base_classes_crans):
# Propriéraire inconnu mais ce n'est pas grave
self.__proprietaire = None
elif t in [ adherent, club, crans, Invite ] and typ in [ 'fixe' , 'wifi' , 'borne' ]:
elif t in [ adherent, club, crans ] and typ in [ 'fixe' , 'wifi' , 'borne' ]:
# Machine vide
self.__proprietaire = parent_or_tuple
self.dn = parent_or_tuple.dn
@ -2407,9 +2405,7 @@ class Machine(base_classes_crans):
# Dans quel réseau la machine doit-elle être placée ?
if self.__typ == 'wifi':
if self.proprietaire().__class__ == Invite:
net = config.NETs['wifi-invite']
elif self.proprietaire().etudes(0) == "ENS" and self.proprietaire().etudes(1) == "Pers":
if self.proprietaire().etudes(0) == "ENS" and self.proprietaire().etudes(1) == "Pers":
# Personnel ENS
net = config.NETs['wifi-ens']
else:
@ -2516,7 +2512,7 @@ class Machine(base_classes_crans):
def proprietaire(self):
"""
retroune le propriétaire de la machine (classe adherent, club ou crans ou Invite)
retroune le propriétaire de la machine (classe adherent, club ou crans)
"""
if not self.__proprietaire:
res = self.conn.search_s(','.join(self.dn.split(',')[1:]), 0)
@ -2524,8 +2520,6 @@ class Machine(base_classes_crans):
self.__proprietaire = adherent(res[0], self._modifiable, self.conn)
elif 'club' in res[0][1]['objectClass']:
self.__proprietaire = club(res[0], self._modifiable, self.conn)
elif 'invite' in res[0][0]:
self.__proprietaire = Invite(self.conn)
else:
self.__proprietaire = crans(self.conn)
@ -2923,16 +2917,6 @@ class crans(_FakeProprio):
def chbre(self):
return u"CRA"
class Invite(_FakeProprio):
""" Propriétaire des machines invitées """
def __init__(self, conn=None):
_FakeProprio.__init__(self, conn)
self.dn = "ou=invites," + self.base_dn
def Nom(self):
return u"Invité"
def chbre(self):
return u"N/A"
if __name__ == '__main__':
import sys