From e8d1ffbe21dcd1f4700749f7db94f47046412e2b Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Wed, 14 Jun 2017 00:00:31 -0400 Subject: [PATCH] Fix issue where a django user may not have an associated email address and therefore get_email.py will barf --- helpdesk/management/commands/get_email.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 1c468dca..8d91f27b 100644 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -373,9 +373,10 @@ def ticket_from_message(message, queue, logger): if cc: # get list of currently CC'd emails current_cc = TicketCC.objects.filter(ticket=ticket) - current_cc_emails = [x.email for x in current_cc] - # get emails of any Users CC'd to email - current_cc_users = [x.user.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, if defined + # (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 other_emails = [queue.email_address] if t.submitter_email: