From 3baea05e6d2391b535ebe2b6fd923c1f9f2309f3 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 2 Oct 2020 14:13:17 +0000 Subject: [PATCH] Use the id-archive wherever we had been using the id-repository. Fixes #3080. Commit ready for merge. - Legacy-Id: 18550 --- ietf/doc/redirect_drafts_urls.py | 3 ++- ietf/doc/views_doc.py | 9 +++++---- ietf/settings.py | 2 +- ietf/submit/admin.py | 3 ++- ietf/submit/tests.py | 1 + ietf/templates/doc/index_all_drafts.html | 6 +++--- ietf/templates/iesg/agenda_conflict_doc.html | 2 +- ietf/templates/submit/announce_new_version.txt | 4 ++-- ietf/templates/submit/announce_to_authors.txt | 4 ++-- ietf/templates/submit/announce_to_lists.txt | 4 ++-- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ietf/doc/redirect_drafts_urls.py b/ietf/doc/redirect_drafts_urls.py index 42e4c6c27..9673caa26 100644 --- a/ietf/doc/redirect_drafts_urls.py +++ b/ietf/doc/redirect_drafts_urls.py @@ -1,5 +1,6 @@ # Copyright The IETF Trust 2007, All Rights Reserved +from django.conf import settings from django.views.generic import RedirectView from django.http import HttpResponsePermanentRedirect from django.shortcuts import get_object_or_404 @@ -17,5 +18,5 @@ urlpatterns = [ url(r'^(?P[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)), url(r'^wgid/(?P\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)), url(r'^wg/(?P[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/', permanent=True)), - url(r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='https://www.ietf.org/id/all_id.txt', permanent=True)), + url(r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='%s/all_id.txt'%settings.IETF_ID_ARCHIVE_URL, permanent=True)), ] diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index f1940e003..df6fb7f37 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -248,10 +248,11 @@ def document_main(request, name, rev=None): possible_types = settings.IDSUBMIT_FILE_TYPES found_types = [t for t in possible_types if os.path.exists(base_path + t)] - if not snapshot and doc.get_state_slug() == "active": - base = settings.IETF_ID_URL - else: - base = settings.IETF_ID_ARCHIVE_URL + # if not snapshot and doc.get_state_slug() == "active": + # base = settings.IETF_ID_URL + # else: + # base = settings.IETF_ID_ARCHIVE_URL + base = settings.IETF_ID_ARCHIVE_URL file_urls = [] for t in found_types: diff --git a/ietf/settings.py b/ietf/settings.py index a214c9a1b..b3e7d8a57 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -140,7 +140,7 @@ OLD_PHOTO_DIRS = [ ] IETF_HOST_URL = 'https://www.ietf.org/' -IETF_ID_URL = IETF_HOST_URL + 'id/' +IETF_ID_URL = IETF_HOST_URL + 'id/' # currently unused IETF_ID_ARCHIVE_URL = IETF_HOST_URL + 'archive/id/' IETF_AUDIO_URL = IETF_HOST_URL + 'audio/' diff --git a/ietf/submit/admin.py b/ietf/submit/admin.py index 5c6c4e2dd..05ee2480c 100644 --- a/ietf/submit/admin.py +++ b/ietf/submit/admin.py @@ -1,6 +1,7 @@ # Copyright The IETF Trust 2011-2020, All Rights Reserved from django.urls import reverse as urlreverse from django.contrib import admin +from django.conf import settings from ietf.submit.models import Preapproval, Submission, SubmissionEvent, SubmissionCheck, SubmissionEmailEvent @@ -21,7 +22,7 @@ class SubmissionAdmin(admin.ModelAdmin): def draft_link(self, instance): if instance.state_id == "posted": - return '%s' % (instance.name, instance.rev, instance.name) + return '%s' % (settings.IETF_ID_ARCHIVE_URL,instance.name, instance.rev, instance.name) else: return instance.name draft_link.allow_tags = True # type: ignore # https://github.com/python/mypy/issues/2087 diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py index b93d1c655..07beee539 100644 --- a/ietf/submit/tests.py +++ b/ietf/submit/tests.py @@ -351,6 +351,7 @@ class SubmitTests(TestCase): self.assertIn("New Version Notification",outbox[-2]["Subject"]) self.assertIn(name, get_payload_text(outbox[-2])) self.assertIn("mars", get_payload_text(outbox[-2])) + self.assertIn(settings.IETF_ID_ARCHIVE_URL, get_payload_text(outbox[-2])) # Check "Review of suggested possible replacements for..." mail self.assertIn("review", outbox[-1]["Subject"].lower()) self.assertIn(name, get_payload_text(outbox[-1])) diff --git a/ietf/templates/doc/index_all_drafts.html b/ietf/templates/doc/index_all_drafts.html index d85d78b0c..3aab8a689 100644 --- a/ietf/templates/doc/index_all_drafts.html +++ b/ietf/templates/doc/index_all_drafts.html @@ -18,9 +18,9 @@

In addition, the following files are available for download:

diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html index 23bbf07da..f456a5e55 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.html +++ b/ietf/templates/iesg/agenda_conflict_doc.html @@ -17,7 +17,7 @@
{{ conflictdoc.stream }} {{ conflictdoc.intended_std_level }}
- + {{ conflictdoc.name }} diff --git a/ietf/templates/submit/announce_new_version.txt b/ietf/templates/submit/announce_new_version.txt index 392cead63..414369530 100644 --- a/ietf/templates/submit/announce_new_version.txt +++ b/ietf/templates/submit/announce_new_version.txt @@ -1,7 +1,7 @@ {% autoescape off %} A new version (-{{ submission.rev }}) has been submitted for {{ submission.name }}: -https://www.ietf.org/id/{{ submission.name }}-{{ submission.rev }}.txt{% if submission.xml_version == "3" %} -https://www.ietf.org/id/{{ submission.name }}-{{ submission.rev }}.html{% endif %} +{{settings.IETF_ID_ARCHIVE_URL}}{{ submission.name }}-{{ submission.rev }}.txt{% if submission.xml_version == "3" %} +{{settings.IETF_ID_ARCHIVE_URL}}{{ submission.name }}-{{ submission.rev }}.html{% endif %} {% if msg %} {{ msg|striptags }} {% endif %} diff --git a/ietf/templates/submit/announce_to_authors.txt b/ietf/templates/submit/announce_to_authors.txt index 10bc62668..bebdbda91 100644 --- a/ietf/templates/submit/announce_to_authors.txt +++ b/ietf/templates/submit/announce_to_authors.txt @@ -9,9 +9,9 @@ Title: {{ submission.title }} Document date: {{ submission.document_date|date:"Y-m-d" }} Group: {{ group }} Pages: {{ submission.pages }} -URL: https://www.ietf.org/id/{{ submission.name }}-{{ submission.rev }}.txt +URL: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt Status: https://datatracker.ietf.org/doc/{{ submission.name }}/{% if submission.xml_version == "3" %} -Html: https://www.ietf.org/id/{{ submission.name }}-{{ submission.rev }}.html{% else %} +Html: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %} Htmlized: https://datatracker.ietf.org/doc/html/{{ submission.name }}{% endif %} Htmlized: https://tools.ietf.org/html/{{ submission.name }}-{{ submission.rev }} {% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %} diff --git a/ietf/templates/submit/announce_to_lists.txt b/ietf/templates/submit/announce_to_lists.txt index a31898c58..8cb9ff0d8 100644 --- a/ietf/templates/submit/announce_to_lists.txt +++ b/ietf/templates/submit/announce_to_lists.txt @@ -15,8 +15,8 @@ Abstract: The IETF datatracker status page for this draft is: https://datatracker.ietf.org/doc/{{ submission.name }}/ {% if submission.xml_version == "3" %} -There is also a HTML versions available at: -https://www.ietf.org/id/{{ submission.name }}-{{ submission.rev }}.html{% else %} +There is also a HTML version available at: +{{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %} There are also htmlized versions available at: https://tools.ietf.org/html/{{ submission.name }}-{{ submission.rev }} https://datatracker.ietf.org/doc/html/{{ submission.name }}-{{ submission.rev }}{% endif %}