Skip to content

Commit c586feb

Browse files
committed
Fix an old bug in draft resurrection, it was using the long gone
doc.idinternal in an explanation - Legacy-Id: 12027
1 parent 99beb58 commit c586feb

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

ietf/doc/views_draft.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -792,11 +792,15 @@ def resurrect(request, name):
792792
if doc.get_state_slug() != "expired":
793793
raise Http404
794794

795+
resurrect_requested_by = None
796+
e = doc.latest_event(type__in=('requested_resurrect', "completed_resurrect"))
797+
if e.type == 'requested_resurrect':
798+
resurrect_requested_by = e.by
799+
795800
if request.method == 'POST':
796-
e = doc.latest_event(type__in=('requested_resurrect', "completed_resurrect"))
797-
if e and e.type == 'requested_resurrect':
798-
email_resurrection_completed(request, doc, requester=e.by)
799-
801+
if resurrect_requested_by:
802+
email_resurrection_completed(request, doc, requester=resurrect_requested_by)
803+
800804
events = []
801805
e = DocEvent(doc=doc, by=request.user.person)
802806
e.type = "completed_resurrect"
@@ -812,6 +816,7 @@ def resurrect(request, name):
812816

813817
return render_to_response('doc/draft/resurrect.html',
814818
dict(doc=doc,
819+
resurrect_requested_by=resurrect_requested_by,
815820
back_url=doc.get_absolute_url()),
816821
context_instance=RequestContext(request))
817822

ietf/templates/doc/draft/resurrect.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h1>Resurrect<br><small>{{ doc }}</small></h1>
1414
<p>Resurrect {{ doc }}?</p>
1515

1616
<p>
17-
This will change the status to Active {% if doc.idinternal.resurrect_requested_by %} and email a notice to {{ doc.idinternal.resurrect_requested_by }}{% endif %}.
17+
This will change the status to Active{% if resurrect_requested_by %} and email a notice to {{ resurrect_requested_by }}{% endif %}.
1818
</p>
1919

2020
<form method="post">

0 commit comments

Comments
 (0)