From faeb3651dd04263d783e6c905f63a77a709e21fd Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Mon, 3 Feb 2014 18:44:13 +0100 Subject: [PATCH] =?UTF-8?q?[objets]=20Ajout=20d'attributs=20=C3=A0=20crans?= =?UTF-8?q?Account.=20Les=20club=20aussi=20peuvent=20avoir=20un=20compte?= =?UTF-8?q?=20crans.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- objets.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/objets.py b/objets.py index 276390b..238c522 100644 --- a/objets.py +++ b/objets.py @@ -68,7 +68,8 @@ crans_account_attribs = [attributs.uid, attributs.canonicalAlias, attributs.sold attributs.homepageAlias, attributs.loginShell, attributs.gecos, attributs.uidNumber, attributs.homeDirectory, attributs.gidNumber, attributs.userPassword, - attributs.mailAlias, attributs.cn] + attributs.mailAlias, attributs.cn, attributs.rewriteMailHeaders, + attributs.mailExt, attributs.compteWiki, attributs.droits] def new_cransldapobject(conn, dn, mode='ro', uldif=None): """Crée un objet :py:class:`CransLdapObject` en utilisant la classe correspondant à @@ -539,6 +540,9 @@ class proprio(CransLdapObject): super(proprio, self).__init__(conn, dn, mode, ldif) self._machines = None self._factures = None + if u'cransAccount' in [ unicode(o) for o in self['objectClass']]: + self.attribs = self.attribs + crans_account_attribs + self.full = True def sursis_carte(self): for h in self['historique'][::-1]: @@ -803,9 +807,8 @@ class adherent(proprio): attribs = proprio.attribs + [attributs.aid, attributs.prenom, attributs.tel, attributs.mail, attributs.mailInvalide, attributs.charteMA, attributs.derniereConnexion, attributs.gpgFingerprint, - attributs.carteEtudiant, attributs.droits, attributs.etudes, - attributs.postalAddress, attributs.mailExt, attributs.compteWiki, - attributs.gpgMail, + attributs.carteEtudiant, attributs.etudes, + attributs.postalAddress, attributs.gpgMail, ] ldap_name = "adherent" @@ -814,9 +817,6 @@ class adherent(proprio): self.full = False self._clubs = None self._imprimeur_clubs = None - if u'cransAccount' in [ unicode(o) for o in self['objectClass']]: - self.attribs = self.attribs + crans_account_attribs - self.full = True def clubs(self): """Renvoie la liste des clubs dont l'adherent est responsable"""