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

Merged in [19830] from jennifer@painless-security.com:

Browse source 
Include RFC title in doc/html view title element. Fixes #3488.
 - Legacy-Id: 19843
Note: SVN reference [19830] has been migrated to Git commit f7162b690e
This commit is contained in:
Robert Sparks 2022-01-14 17:27:04 +00:00
parent 70a9053387 f7162b690e
commit eb18519f65
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ietf/doc/tests.py
View file

@ -678,17 +678,24 @@ Man Expires September 22, 2015 [Page 3]
self.assertContains(r, "Versions:") self.assertContains(r, "Versions:")
self.assertContains(r, "Deimos street") self.assertContains(r, "Deimos street")
q = PyQuery(r.content) q = PyQuery(r.content)
self.assertEqual(q('title').text(), 'draft-ietf-mars-test-01')
self.assertEqual(len(q('.rfcmarkup pre')), 4) self.assertEqual(len(q('.rfcmarkup pre')), 4)
self.assertEqual(len(q('.rfcmarkup span.h1')), 2) self.assertEqual(len(q('.rfcmarkup span.h1')), 2)
self.assertEqual(len(q('.rfcmarkup a[href]')), 41) self.assertEqual(len(q('.rfcmarkup a[href]')), 41)
r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=draft.name, rev=draft.rev))) r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=draft.name, rev=draft.rev)))
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
q = PyQuery(r.content)
self.assertEqual(q('title').text(), 'draft-ietf-mars-test-01')
rfc = WgRfcFactory() rfc = WgRfcFactory()
(Path(settings.RFC_PATH) / rfc.get_base_name()).touch() (Path(settings.RFC_PATH) / rfc.get_base_name()).touch()
r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name()))) r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name())))
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
q = PyQuery(r.content)
self.assertEqual(q('title').text(), f'RFC {rfc.rfc_number()} - {rfc.title}')
# synonyms for the rfc should be redirected to its canonical view
r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.rfc_number()))) r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.rfc_number())))
self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name()))) self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name())))
r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=f'RFC {rfc.rfc_number()}'))) r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=f'RFC {rfc.rfc_number()}')))

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

@ -28,7 +28,7 @@
{% block title %} {% block title %}
{% if doc.get_state_slug == "rfc" %} {% if doc.get_state_slug == "rfc" %}
{{ doc.canonical_name }} RFC {{ doc.rfc_number }} - {{ doc.title }}
{% else %} {% else %}
{{ doc.name }}-{{ doc.rev }} {{ doc.name }}-{{ doc.rev }}
{% endif %} {% endif %}