From a7fed41d2c7c004d2515e94e40536211d8b2f74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= <jimenezmoral@gmail.com>
Date: Wed, 8 May 2013 07:43:15 +0000
Subject: [PATCH] Show name of feedback provider.

Fixes #1012
 - Legacy-Id: 5707
---
 ietf/nomcom/templatetags/nomcom_tags.py          | 15 +++++++++------
 ietf/templates/nomcom/view_feedback_nominee.html |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ietf/nomcom/templatetags/nomcom_tags.py b/ietf/nomcom/templatetags/nomcom_tags.py
index 9f2ce460b..9444642e5 100644
--- a/ietf/nomcom/templatetags/nomcom_tags.py
+++ b/ietf/nomcom/templatetags/nomcom_tags.py
@@ -43,12 +43,15 @@ def add_num_nominations(user, position, nominee):
 
 
 @register.filter
-def get_person(email):
-    person = email
-    if email:
-        persons = Person.objects.filter(email__address__in=[email])
-        person = persons and persons[0].name or person
-    return person
+def formatted_email(address):
+    person = None
+    if address:
+        persons = Person.objects.filter(email__address__in=[address])
+        person = persons and persons[0] or None
+    if person and person.name:
+        return u'"%s" <%s>' % (person.plain_name(), address)
+    else:
+        return address
 
 
 @register.simple_tag
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index d4e1daad5..92f31b18b 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -39,7 +39,7 @@
         {% for feedback in nominee.feedback_set.all %}
           {% ifequal feedback.type.slug ft.slug %}
             <div>
-              <h3 class="ietf-divider">From {{ feedback.author|get_person|default:"Anonymous" }} ({{ feedback.time|date:"Y-m-d" }})</h3>
+              <h3 class="ietf-divider">From {{ feedback.author|formatted_email|default:"Anonymous" }} ({{ feedback.time|date:"Y-m-d" }})</h3>
               {% ifequal ft.slug "nomina" %}
                 {% for fn in feedback.nomination_set.all %}
                   {% if fn.candidate_name %}