Added a new field, #16: draft AD (name and email) to all_id2.txt

- Legacy-Id: 5128
This commit is contained in:
Henrik Levkowetz 2012-12-15 22:43:10 +00:00
parent af9a442ca2
commit 6f5ae2edcd

View file

@ -102,7 +102,7 @@ def all_id2_entry(id):
elif id.group.type_id == "wg" and id.group.parent:
area = id.group.parent.acronym
fields.append(area)
# 9
# 9 responsible AD name
fields.append(id.idinternal.job_owner if id.idinternal else "")
# 10
s = id.intended_status
@ -139,6 +139,15 @@ def all_id2_entry(id):
else:
name = u""
fields.append(name)
# 16 Responsible AD name and email
if id.ad:
ad = id.ad
realname = unicode(ad)
email = ad.email_address()
name = re.sub(u"[<>@,]", u"", realname) + u" <"+re.sub(u"[<>,]", u"", email).strip()+u">"
else:
name = u""
fields.append(name)
#
return "\t".join([unicode(x) for x in fields])