Skip to content

Commit ff9ae1a

Browse files
committed
Merged in [8801] from rjsparks@nostrum.com:
Verify that add_state_change_event returned something before trying to use attributes of the return value. Fixes bug ietf-tools#1566. - Legacy-Id: 8871 Note: SVN reference [8801] has been migrated to Git commit 601575a
2 parents 46e2ed7 + 601575a commit ff9ae1a

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

ietf/doc/views_ballot.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ def do_undefer_ballot(request, doc):
6868
doc.save()
6969

7070
update_telechat(request, doc, login, telechat_date)
71-
email_state_changed(request, doc, e.desc)
71+
if e:
72+
email_state_changed(request, doc, e.desc)
7273
email_ballot_undeferred(request, doc, login.plain_name(), telechat_date)
7374

7475
def position_to_ballot_choice(position):
@@ -360,7 +361,8 @@ def defer_ballot(request, name):
360361
doc.time = (e and e.time) or datetime.datetime.now()
361362
doc.save()
362363

363-
email_state_changed(request, doc, e.desc)
364+
if e:
365+
email_state_changed(request, doc, e.desc)
364366

365367
update_telechat(request, doc, login, telechat_date)
366368
email_ballot_deferred(request, doc, login.plain_name(), telechat_date)
@@ -454,8 +456,9 @@ def lastcalltext(request, name):
454456
doc.time = (e and e.time) or datetime.datetime.now()
455457
doc.save()
456458

457-
email_state_changed(request, doc, e.desc)
458-
email_ad(request, doc, doc.ad, login, e.desc)
459+
if e:
460+
email_state_changed(request, doc, e.desc)
461+
email_ad(request, doc, doc.ad, login, e.desc)
459462

460463
request_last_call(request, doc)
461464

0 commit comments

Comments
 (0)