[lc_ldap] Formatage du nom de l'auteur dans l'historique
This commit is contained in:
parent
ffb51cc255
commit
7fd176cc3d
1 changed files with 11 additions and 2 deletions
13
lc_ldap.py
13
lc_ldap.py
|
@ -340,8 +340,17 @@ class CransLdapObject(object):
|
||||||
out = []
|
out = []
|
||||||
for cn, attrs in res:
|
for cn, attrs in res:
|
||||||
date = crans_utils.format_ldap_time(attrs['reqEnd'][0])
|
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':
|
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':
|
elif attrs['reqType'][0] == 'modify':
|
||||||
fields = {}
|
fields = {}
|
||||||
for mod in attrs['reqMod']:
|
for mod in attrs['reqMod']:
|
||||||
|
@ -357,7 +366,7 @@ class CransLdapObject(object):
|
||||||
mods = fields[field]
|
mods = fields[field]
|
||||||
mod_list.append(u"%s %s" %(field, ", ".join(mods)))
|
mod_list.append(u"%s %s" %(field, ", ".join(mods)))
|
||||||
if mod_list != []:
|
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
|
return out
|
||||||
|
|
||||||
def blacklist(self, sanction, commentaire, debut=time.time(), fin = '-'):
|
def blacklist(self, sanction, commentaire, debut=time.time(), fin = '-'):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue