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

fix: make Was link go to the right place. Remove unreachable code.

Browse source
This commit is contained in:
Robert Sparks 2023-09-15 16:49:21 -05:00
parent e0e647fa75
commit 88e66048da
No known key found for this signature in database
GPG key ID: 6E2A6A5775F91318
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ietf/doc/views_doc.py
View file

@ -308,7 +308,6 @@ def document_main(request, name, rev=None, document_html=False):
css = Path(finders.find("ietf/css/document_html_inline.css")).read_text()
if html:
css += Path(finders.find("ietf/css/document_html_txt.css")).read_text()
draft_that_became_rfc = doc.came_from_draft()
# submission
submission = ""
@ -324,19 +323,7 @@ def document_main(request, name, rev=None, document_html=False):
else:
submission = group.acronym
submission = '<a href="%s">%s</a>' % (group.about_url(), submission)
# Should be unreachable?
if (
draft_that_became_rfc
and draft_that_became_rfc.stream_id
and draft_that_became_rfc.get_state_slug(
"draft-stream-%s" % draft_that_became_rfc.stream_id
)
== "c-adopt"
):
submission = "candidate for %s" % submission
# todo replace document_html?
return render(request, "doc/document_rfc.html" if document_html is False else "doc/document_html.html",
dict(doc=doc,
document_html=document_html,
@ -354,7 +341,6 @@ def document_main(request, name, rev=None, document_html=False):
can_edit_authors=can_edit_authors,
can_change_stream=can_change_stream,
rfc_number=doc.rfc_number,
draft_name=draft_that_became_rfc and draft_that_became_rfc.name,
updates=interesting_relations_that_doc.filter(relationship="updates"),
updated_by=interesting_relations_that.filter(relationship="updates"),
obsoletes=interesting_relations_that_doc.filter(relationship="obs"),
@ -679,7 +665,6 @@ def document_main(request, name, rev=None, document_html=False):
can_request_review=can_request_review,
can_submit_unsolicited_review_for_teams=can_submit_unsolicited_review_for_teams,
draft_name=doc.name,
telechat=telechat,
iesg_ballot_summary=iesg_ballot_summary,
submission=submission,

4
ietf/templates/doc/document_info.html
View file

@ -52,10 +52,10 @@
{% if proposed_status_changes %}
<div>Proposed status changed by {{ proposed_status_changes|urlize_related_source_list|join:", " }}</div>
{% endif %}
{% if draft_name %}
{% if doc.came_from_draft %}
<div>
Was
<a href="{% url 'ietf.doc.views_doc.document_main' name=draft_name %}">{{ draft_name }}</a>
<a href="{% url 'ietf.doc.views_doc.document_main' name=doc.came_from_draft.name rev=doc.came_from_draft.rev%}">{{ doc.came_from_draft.name }}</a>
{% if submission %}({{ submission|safe }}){% endif %}
</div>
{% endif %}