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

Fix the format links to point to correct location when latest snapshot

Browse source 
is used, also corrects the versions links at the top.
 - Legacy-Id: 18875
This commit is contained in:
Tero Kivinen 2021-03-02 19:06:36 +00:00
parent 84a25ed491
commit fedab94d3d
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ietf/doc/views_doc.py
View file

@ -242,8 +242,12 @@ def document_main(request, name, rev=None):
content = doc.text_or_error() # pyflakes:ignore
content = markup_txt.markup(maybe_split(content, split=split_content))
if snapshot:
name = doc.doc.name
else:
name = doc.name
# file types
base_path = os.path.join(settings.INTERNET_DRAFT_PATH, doc.name + "-" + doc.rev + ".")
base_path = os.path.join(settings.INTERNET_DRAFT_PATH, name + "-" + doc.rev + ".")
possible_types = settings.IDSUBMIT_FILE_TYPES
found_types = [t for t in possible_types if os.path.exists(base_path + t)]
@ -256,13 +260,13 @@ def document_main(request, name, rev=None):
file_urls = []
for t in found_types:
label = "plain text" if t == "txt" else t
file_urls.append((label, base + doc.name + "-" + doc.rev + "." + t))
file_urls.append((label, base + name + "-" + doc.rev + "." + t))
if "pdf" not in found_types:
file_urls.append(("pdf", settings.TOOLS_ID_PDF_URL + doc.name + "-" + doc.rev + ".pdf"))
#file_urls.append(("htmlized", settings.TOOLS_ID_HTML_URL + doc.name + "-" + doc.rev))
file_urls.append(("htmlized (tools)", settings.TOOLS_ID_HTML_URL + doc.name + "-" + doc.rev))
file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=doc.name, rev=doc.rev))))
file_urls.append(("pdf", settings.TOOLS_ID_PDF_URL + name + "-" + doc.rev + ".pdf"))
#file_urls.append(("htmlized", settings.TOOLS_ID_HTML_URL + name + "-" + doc.rev))
file_urls.append(("htmlized (tools)", settings.TOOLS_ID_HTML_URL + name + "-" + doc.rev))
file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=name, rev=doc.rev))))
# latest revision
latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")

2
ietf/templates/doc/revisions_list.html
View file

@ -3,7 +3,7 @@
<li class="disabled"><a><b>Versions</b></a></li>
{% for rev in revisions %}
<li {% if rev == doc.rev %}{% if snapshot or not doc.get_state_slug == "rfc" %}{% if rev == latest_rev and not doc.get_state_slug == "rfc" %}class="active"{% else %}class="warning"{% endif %}{% endif %}{% endif %}>
<a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}{{ rev }}/" {% if rev != "00" and rev != latest_rev %}rel="nofollow"{% endif %} >{{ rev }}</a>
<a href="{% if snapshot and doc.get_state_slug == "rfc" %}{% url "ietf.doc.views_doc.document_main" name=doc.doc.name %}{% else %}{% url "ietf.doc.views_doc.document_main" name=doc.name %}{% endif %}{{ rev }}/" {% if rev != "00" and rev != latest_rev %}rel="nofollow"{% endif %} >{{ rev }}</a>
</li>
{% endfor %}
</ul>