From 7fd176cc3deca56e20d443181cc1205d40561b5c Mon Sep 17 00:00:00 2001 From: Olivier Iffrig Date: Tue, 30 Nov 2010 22:42:52 +0100 Subject: [PATCH] [lc_ldap] Formatage du nom de l'auteur dans l'historique --- lc_ldap.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lc_ldap.py b/lc_ldap.py index 75bdc58..7b5896d 100644 --- a/lc_ldap.py +++ b/lc_ldap.py @@ -340,8 +340,17 @@ class CransLdapObject(object): out = [] for cn, attrs in res: date = crans_utils.format_ldap_time(attrs['reqEnd'][0]) + author = attrs['reqAuthzID'][0] + if author == "cn=admin,dc=crans,dc=org": + author = u"respbats" + else: + author = author.split(",", 1)[0] + res = self.conn.search(author) + if res != []: + author = res[0].compte() + if attrs['reqType'][0] == 'delete': - out.append(u"%s : [%s] Suppression" % (date, attrs['reqAuthzID'][0].decode('utf-8'))) + out.append(u"%s : [%s] Suppression" % (date, author)) elif attrs['reqType'][0] == 'modify': fields = {} for mod in attrs['reqMod']: @@ -357,7 +366,7 @@ class CransLdapObject(object): mods = fields[field] mod_list.append(u"%s %s" %(field, ", ".join(mods))) if mod_list != []: - out.append(u"%s : [%s] %s" % (date, attrs['reqAuthzID'][0].decode('utf-8'), " ; ".join(mod_list))) + out.append(u"%s : [%s] %s" % (date, author, u" ; ".join(mod_list))) return out def blacklist(self, sanction, commentaire, debut=time.time(), fin = '-'):