Plus de wifi prof dsormais
darcs-hash:20060714205033-c3cc4-7f9cdf341578d12bd720114dc5448e3230605910.gz
This commit is contained in:
parent
0b610a7135
commit
5130d4ad1b
3 changed files with 66 additions and 117 deletions
|
@ -1622,7 +1622,7 @@ class BaseProprietaire(BaseClasseCrans):
|
|||
if nouveau:
|
||||
ret += coul(u"%s inscrit avec succès." % self.Nom(), 'vert')
|
||||
|
||||
if self.idn !='cid' and self.etudes(1) != "Pers":
|
||||
if self.idn !='cid':
|
||||
# Mail de bienvenue
|
||||
self.services_to_restart('mail_bienvenue', [self.mail().encode('iso-8859-15')])
|
||||
|
||||
|
@ -2566,11 +2566,7 @@ class Machine(BaseClasseCrans):
|
|||
|
||||
# Dans quel réseau la machine doit-elle être placée ?
|
||||
if isinstance(self, MachineWifi):
|
||||
if self.proprietaire().etudes(0) == "ENS" and self.proprietaire().etudes(1) == "Pers":
|
||||
# Personnel ENS
|
||||
net = config.NETs['wifi-ens']
|
||||
else:
|
||||
net = config.NETs['wifi-adh']
|
||||
net = config.NETs['wifi-adh']
|
||||
elif isinstance(self, BorneWifi):
|
||||
net = config.NETs['bornes']
|
||||
elif isinstance(self.proprietaire(), AssociationCrans):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue