parent
34ec539ff2
commit
a7fed41d2c
|
@ -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
|
||||
|
|
|
@ -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 %}
|
||||
|
|
Loading…
Reference in a new issue