extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2024-10-05 09:52:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #518 from gwasser/fix_cc_user_email

Browse Source 
Fix get_email issue when user does not have an email
This commit is contained in:
Garret Wassermann 2017-08-20 21:13:07 -04:00 committed by GitHub
commit c781644e34
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helpdesk/management/commands/get_email.py
View File

@ -388,9 +388,10 @@ def ticket_from_message(message, queue, logger):
if cc: if cc:
# get list of currently CC'd emails # get list of currently CC'd emails
current_cc = TicketCC.objects.filter(ticket=ticket) current_cc = TicketCC.objects.filter(ticket=ticket)
current_cc_emails = [x.email for x in current_cc] current_cc_emails = [x.email for x in current_cc if x.email]
# get emails of any Users CC'd to email # get emails of any Users CC'd to email, if defined
current_cc_users = [x.user.email for x in current_cc] # (some Users may not have an associated email, e.g, when using LDAP)
current_cc_users = [x.user.email for x in current_cc if x.user and x.user.email]
# ensure submitter, assigned user, queue email not added # ensure submitter, assigned user, queue email not added
other_emails = [queue.email_address] other_emails = [queue.email_address]
if t.submitter_email: if t.submitter_email: