extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-09 16:15:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.2.8 bugfixes

Browse Source
This commit is contained in:
Garret Wassermann
2018-07-03 00:59:33 -04:00
parent c71355cfdc 9cb32f83ca
commit dff14d40d3
13 changed files with 85 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
helpdesk/models.py
View File

@ -17,6 +17,7 @@ from django.utils import timezone
from django.utils import six
from django.utils.translation import ugettext_lazy as _, ugettext
from django.utils.encoding import python_2_unicode_compatible
import re
import six
@ -279,7 +280,13 @@ class Queue(models.Model):
in the sender name field, so hopefully the admin can see and fix it.
"""
if not self.email_address:
return u'NO QUEUE EMAIL ADDRESS DEFINED <%s>' % settings.DEFAULT_FROM_EMAIL
# must check if given in format "Foo <foo@example.com>"
default_email = re.match(".*<(?P<email>.*@*.)>", settings.DEFAULT_FROM_EMAIL)
if default_email is not None:
# already in the right format, so just include it here
return u'NO QUEUE EMAIL ADDRESS DEFINED %s' % settings.DEFAULT_FROM_EMAIL
else:
return u'NO QUEUE EMAIL ADDRESS DEFINED <%s>' % settings.DEFAULT_FROM_EMAIL
else:
return u'%s <%s>' % (self.title, self.email_address)
from_address = property(_from_address)