From 601575a3d56c7137d9d7f6ae9b72c225eac46041 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 18 Dec 2014 20:23:57 +0000 Subject: [PATCH] Verify that add_state_change_event returned something before trying to use attributes of the return value. Fixes bug #1566. Commit ready for merge. - Legacy-Id: 8801 --- ietf/doc/views_ballot.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py index 5d511b315..bd6eaad03 100644 --- a/ietf/doc/views_ballot.py +++ b/ietf/doc/views_ballot.py @@ -68,7 +68,8 @@ def do_undefer_ballot(request, doc): doc.save() update_telechat(request, doc, login, telechat_date) - email_state_changed(request, doc, e.desc) + if e: + email_state_changed(request, doc, e.desc) email_ballot_undeferred(request, doc, login.plain_name(), telechat_date) def position_to_ballot_choice(position): @@ -360,7 +361,8 @@ def defer_ballot(request, name): doc.time = (e and e.time) or datetime.datetime.now() doc.save() - email_state_changed(request, doc, e.desc) + if e: + email_state_changed(request, doc, e.desc) update_telechat(request, doc, login, telechat_date) email_ballot_deferred(request, doc, login.plain_name(), telechat_date) @@ -454,8 +456,9 @@ def lastcalltext(request, name): doc.time = (e and e.time) or datetime.datetime.now() doc.save() - email_state_changed(request, doc, e.desc) - email_ad(request, doc, doc.ad, login, e.desc) + if e: + email_state_changed(request, doc, e.desc) + email_ad(request, doc, doc.ad, login, e.desc) request_last_call(request, doc)