Improved the resilience of the formatted_email nomcom filter. Fixes #1764. Commit ready for merge.
- Legacy-Id: 14506
This commit is contained in:
parent
c8b451094a
commit
2dd1f0da29
|
@ -1,5 +1,6 @@
|
|||
import os
|
||||
import tempfile
|
||||
import re
|
||||
|
||||
from django import template
|
||||
from django.conf import settings
|
||||
|
@ -38,11 +39,16 @@ def lookup(container,key):
|
|||
@register.filter
|
||||
def formatted_email(address):
|
||||
person = None
|
||||
if address:
|
||||
persons = Person.objects.filter(email__address__in=[address])
|
||||
addrmatch = re.search('<([^>]+)>',address)
|
||||
if addrmatch:
|
||||
addr = addrmatch.group(1)
|
||||
else:
|
||||
addr = address
|
||||
if addr:
|
||||
persons = Person.objects.filter(email__address__in=[addr])
|
||||
person = persons and persons[0] or None
|
||||
if person and person.name:
|
||||
return formataddr((person.plain_name(), address))
|
||||
return formataddr((person.plain_name(), addr))
|
||||
else:
|
||||
return address
|
||||
|
||||
|
|
Loading…
Reference in a new issue