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

Fix an old bug in draft resurrection, it was using the long gone

Browse source 
doc.idinternal in an explanation
 - Legacy-Id: 12027
This commit is contained in:
Ole Laursen 2016-09-23 15:29:27 +00:00
parent 99beb58291
commit c586feb579
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ietf/doc/views_draft.py
View file

@ -792,11 +792,15 @@ def resurrect(request, name):
if doc.get_state_slug() != "expired":
raise Http404
resurrect_requested_by = None
e = doc.latest_event(type__in=('requested_resurrect', "completed_resurrect"))
if e.type == 'requested_resurrect':
resurrect_requested_by = e.by
if request.method == 'POST':
e = doc.latest_event(type__in=('requested_resurrect', "completed_resurrect"))
if e and e.type == 'requested_resurrect':
email_resurrection_completed(request, doc, requester=e.by)
if resurrect_requested_by:
email_resurrection_completed(request, doc, requester=resurrect_requested_by)
events = []
e = DocEvent(doc=doc, by=request.user.person)
e.type = "completed_resurrect"
@ -812,6 +816,7 @@ def resurrect(request, name):
return render_to_response('doc/draft/resurrect.html',
dict(doc=doc,
resurrect_requested_by=resurrect_requested_by,
back_url=doc.get_absolute_url()),
context_instance=RequestContext(request))

2
ietf/templates/doc/draft/resurrect.html
View file

@ -14,7 +14,7 @@
<p>Resurrect {{ doc }}?</p>
<p>
This will change the status to Active {% if doc.idinternal.resurrect_requested_by %} and email a notice to {{ doc.idinternal.resurrect_requested_by }}{% endif %}.
This will change the status to Active{% if resurrect_requested_by %} and email a notice to {{ resurrect_requested_by }}{% endif %}.
</p>
<form method="post">