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 #1566.
- Legacy-Id: 8871
Note: SVN reference [8801] has been migrated to Git commit 601575a3d5
This commit is contained in:
commit
ff9ae1ad04
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue