holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow multiple e-mails to be entered for the queue CC email addresses. Separate with a comma. Closes GH-49.

Browse Source
This commit is contained in:
Ross Poulton 2011-03-05 03:29:01 +00:00
parent b31068caa9
commit b5da29dcfe
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
helpdesk/lib.py
View File

@ -102,7 +102,10 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
"{{ ticket.ticket }} {{ ticket.title|safe }} %s" % t.subject
).render(context)
if type(recipients) != list:
if type(recipients) == str:
if recipients.find(','):
recipients = recipients.split(',')
elif type(recipients) != list:
recipients = [recipients,]
msg = EmailMultiAlternatives( subject_part,

12
helpdesk/models.py
View File

@ -80,21 +80,25 @@ class Queue(models.Model):
'increase their priority? Set to 0 for no escalation.'),
)
new_ticket_cc = models.EmailField(
new_ticket_cc = models.CharField(
_('New Ticket CC Address'),
blank=True,
null=True,
max_length=200,
help_text=_('If an e-mail address is entered here, then it will '
'receive notification of all new tickets created for this queue'),
'receive notification of all new tickets created for this queue. '
'Enter a comma between multiple e-mail addresses.'),
)
updated_ticket_cc = models.EmailField(
updated_ticket_cc = models.CharField(
_('Updated Ticket CC Address'),
blank=True,
null=True,
max_length=200,
help_text=_('If an e-mail address is entered here, then it will '
'receive notification of all activity (new tickets, closed '
'tickets, updates, reassignments, etc) for this queue'),
'tickets, updates, reassignments, etc) for this queue. Separate '
'multiple addresses with a comma.'),
)
email_box_type = models.CharField(