altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Protect against cases where add_state_change_event can return None. Fixes bug # 1383. Commit ready for merge.

Browse source 
- Legacy-Id: 7677
This commit is contained in:
Robert Sparks 2014-04-30 22:17:01 +00:00
parent bf4f3ad75f
commit cb458b1689
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/doc/lastcall.py
View file

@ -61,7 +61,7 @@ def expire_last_call(doc):
system = Person.objects.get(name="(System)")
e = add_state_change_event(doc, system, prev_state, new_state, prev_tags=prev_tags, new_tags=[])
doc.time = e.time
doc.time = (e and e.time) or datetime.datetime.now()
doc.save()
email_last_call_expired(doc)

10
ietf/doc/views_ballot.py
View file

@ -64,7 +64,7 @@ def do_undefer_ballot(request, doc):
e = add_state_change_event(doc, login, prev_state, new_state, prev_tags=prev_tags, new_tags=new_tags)
doc.time = e.time
doc.time = (e and e.time) or datetime.datetime.now()
doc.save()
update_telechat(request, doc, login, telechat_date)
@ -360,7 +360,7 @@ def defer_ballot(request, name):
e = add_state_change_event(doc, login, prev_state, new_state, prev_tags=prev_tags, new_tags=new_tags)
doc.time = e.time
doc.time = (e and e.time) or datetime.datetime.now()
doc.save()
email_state_changed(request, doc, e.desc)
@ -450,7 +450,7 @@ def lastcalltext(request, name):
e = add_state_change_event(doc, login, prev_state, new_state, prev_tags=prev_tags, new_tags=[])
doc.time = e.time
doc.time = (e and e.time) or datetime.datetime.now()
doc.save()
email_state_changed(request, doc, e.desc)
@ -694,7 +694,7 @@ def approve_ballot(request, name):
e = add_state_change_event(doc, login, prev_state, new_state, prev_tags=prev_tags, new_tags=[])
doc.time = e.time
doc.time = (e and e.time) or datetime.datetime.now()
doc.save()
email_state_changed(request, doc, change_description)
@ -773,7 +773,7 @@ def make_last_call(request, name):
e = add_state_change_event(doc, login, prev_state, new_state, prev_tags=prev_tags, new_tags=new_tags)
doc.time = e.time
doc.time = (e and e.time) or datetime.datetime.now()
doc.save()
change_description = "Last call has been made for %s and state has been changed to %s" % (doc.name, new_state.name)

2
ietf/doc/views_charter.py
View file

@ -616,7 +616,7 @@ def approve(request, name):
change_description += " and %s state has been changed to %s" % (group.type.name, new_state.name)
e = add_state_change_event(charter, login, prev_charter_state, new_charter_state)
add_state_change_event(charter, login, prev_charter_state, new_charter_state)
# according to spec, 00-02 becomes 01, so copy file and record new revision
try:

6
ietf/doc/views_status_change.py
View file

@ -53,9 +53,9 @@ def change_state(request, name, option=None):
save_document_in_history(status_change)
status_change.set_state(new_state)
add_state_change_event(status_change, login, prev_state, new_state)
e = add_state_change_event(status_change, login, prev_state, new_state)
status_change.time = datetime.datetime.now()
status_change.time = e.time
status_change.save()
if new_state.slug == "iesgeval":
@ -737,7 +737,7 @@ def last_call(request, name):
status_change.set_state(new_state)
e = add_state_change_event(status_change, login, prev_state, new_state)
status_change.time = e.time
status_change.time = (e and e.time) or datetime.datetime.now()
status_change.save()
request_last_call(request, status_change)

2
ietf/secr/telechat/views.py
View file

@ -254,7 +254,7 @@ def doc_detail(request, date, name):
e = add_state_change_event(doc, login, prev_state, new_state,
prev_tags=prev_tags, new_tags=new_tags)
doc.time = e.time
doc.time = (e and e.time) or datetime.datetime.now()
doc.save()
email_state_changed(request, doc, e.desc)