From ef245f1650cd6632e194c535f40b279cac7d2b35 Mon Sep 17 00:00:00 2001 From: Mathieu Segaud Date: Sun, 7 Sep 2008 15:16:28 +0200 Subject: [PATCH] Fixe pour la methode adherentPayant() il n'y a reellement que la classe Adherent pour qui ce test est de toute faon pertinent. darcs-hash:20080907131628-e03ff-5fe81fa81b46c6bcd7b7e5a243e0ad90a6f1f475.gz --- gestion/ldap_crans.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index 5ecb01a7..a32cf451 100755 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -2784,10 +2784,16 @@ class Machine(BaseClasseCrans): net = [ '0.0.0.0/0' ] pool_ip = lister_ip_dispo('all') else: - if self.proprietaire().adherentPayant(): + gratuit = 0 + proprio = self.proprietaire() + if isinstance(proprio, Adherent): + if not proprio.adherentPayant(): + gratuit = 1 + + if gratuit == 0: try: - net = config.NETs[self.proprietaire().chbre()[0].lower()] - pool_ip = lister_ip_dispo(self.proprietaire().chbre()[0].lower()) + net = config.NETs[proprio.chbre()[0].lower()] + pool_ip = lister_ip_dispo(proprio.chbre()[0].lower()) except: raise RuntimeError(u'Impossible de trouver le réseau où placer la machine.') else: