From 7d4ea4e37ad081a4d1974730e3f041e04a4ce7b5 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Wed, 5 Jan 2022 21:05:36 +0000
Subject: [PATCH] Correct the url for the bibtex button. Provide a pdfized
button. Fixes #3501. Commit ready for merge. - Legacy-Id: 19806
---
ietf/doc/utils.py | 7 +++----
ietf/settings.py | 3 ---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
index d266cdbf9..b3d9eb949 100644
--- a/ietf/doc/utils.py
+++ b/ietf/doc/utils.py
@@ -1040,7 +1040,7 @@ def build_file_urls(doc):
file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=name))))
if doc.tags.filter(slug="verified-errata").exists():
file_urls.append(("with errata", settings.RFC_EDITOR_INLINE_ERRATA_URL.format(rfc_number=doc.rfc_number())))
- file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_main',kwargs=dict(name=name))+"bibtex"))
+ file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_bibtex',kwargs=dict(name=name))))
else:
base_path = os.path.join(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR, doc.name + "-" + doc.rev + ".")
possible_types = settings.IDSUBMIT_FILE_TYPES
@@ -1051,10 +1051,9 @@ def build_file_urls(doc):
label = "plain text" if t == "txt" else t
file_urls.append((label, base + doc.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", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=doc.name, rev=doc.rev))))
- file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_main',kwargs=dict(name=doc.name,rev=doc.rev))+"bibtex"))
+ file_urls.append(("pdfized", urlreverse('ietf.doc.views_doc.document_pdfized', kwargs=dict(name=doc.name, rev=doc.rev))))
+ file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_bibtex',kwargs=dict(name=doc.name,rev=doc.rev))))
return file_urls, found_types
diff --git a/ietf/settings.py b/ietf/settings.py
index a48cbebd6..17b5dc24f 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -68,9 +68,6 @@ ALLOWED_HOSTS = [".ietf.org", ".ietf.org.", "209.208.19.216", "4.31.198.44", "12
# Server name of the tools server
TOOLS_SERVER = 'tools.' + IETF_DOMAIN
-TOOLS_SERVER_URL = 'https://' + TOOLS_SERVER
-TOOLS_ID_PDF_URL = TOOLS_SERVER_URL + '/pdf/'
-TOOLS_ID_HTML_URL = TOOLS_SERVER_URL + '/html/'
# Override this in the settings_local.py file:
SERVER_EMAIL = 'Django Server <django-project@' + IETF_DOMAIN + '>'