Skip to content

Commit a7fed41

Browse files
committed
Show name of feedback provider.
Fixes ietf-tools#1012 - Legacy-Id: 5707
1 parent 34ec539 commit a7fed41

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

ietf/nomcom/templatetags/nomcom_tags.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,15 @@ def add_num_nominations(user, position, nominee):
4343

4444

4545
@register.filter
46-
def get_person(email):
47-
person = email
48-
if email:
49-
persons = Person.objects.filter(email__address__in=[email])
50-
person = persons and persons[0].name or person
51-
return person
46+
def formatted_email(address):
47+
person = None
48+
if address:
49+
persons = Person.objects.filter(email__address__in=[address])
50+
person = persons and persons[0] or None
51+
if person and person.name:
52+
return u'"%s" <%s>' % (person.plain_name(), address)
53+
else:
54+
return address
5255

5356

5457
@register.simple_tag

ietf/templates/nomcom/view_feedback_nominee.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h2>Feedback of {{ nominee }} </h2>
3939
{% for feedback in nominee.feedback_set.all %}
4040
{% ifequal feedback.type.slug ft.slug %}
4141
<div>
42-
<h3 class="ietf-divider">From {{ feedback.author|get_person|default:"Anonymous" }} ({{ feedback.time|date:"Y-m-d" }})</h3>
42+
<h3 class="ietf-divider">From {{ feedback.author|formatted_email|default:"Anonymous" }} ({{ feedback.time|date:"Y-m-d" }})</h3>
4343
{% ifequal ft.slug "nomina" %}
4444
{% for fn in feedback.nomination_set.all %}
4545
{% if fn.candidate_name %}

0 commit comments

Comments
 (0)