fix: redundant word in banner for Legacy stream documents (#7207)
* fix: Remove redundant "stream stream" output fix: Change "Legacy stream" to "Legacy" chore: Add "stream" to stream.desc as needed Fixes: #6902 * chore: Remove unused stream_desc parameter The stream_desc key isn't used in template/doc/docuemnt_draft.html to don't pass it in nor compute it Fixes: #6902 * fix: migrate the legacy StreamName --------- Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
This commit is contained in:
parent
b13a606a24
commit
8a5826a941
|
@ -607,12 +607,7 @@ def document_main(request, name, rev=None, document_html=False):
|
||||||
additional_urls = doc.documenturl_set.exclude(tag_id='auth48')
|
additional_urls = doc.documenturl_set.exclude(tag_id='auth48')
|
||||||
|
|
||||||
# Stream description and name passing test
|
# Stream description and name passing test
|
||||||
if doc.stream != None:
|
stream = ("draft-stream-" + doc.stream.slug) if doc.stream != None else "(None)"
|
||||||
stream_desc = doc.stream.desc
|
|
||||||
stream = "draft-stream-" + doc.stream.slug
|
|
||||||
else:
|
|
||||||
stream_desc = "(None)"
|
|
||||||
stream = "(None)"
|
|
||||||
|
|
||||||
html = None
|
html = None
|
||||||
js = None
|
js = None
|
||||||
|
@ -651,7 +646,6 @@ def document_main(request, name, rev=None, document_html=False):
|
||||||
revisions=simple_diff_revisions if document_html else revisions,
|
revisions=simple_diff_revisions if document_html else revisions,
|
||||||
snapshot=snapshot,
|
snapshot=snapshot,
|
||||||
stream=stream,
|
stream=stream,
|
||||||
stream_desc=stream_desc,
|
|
||||||
latest_revision=latest_revision,
|
latest_revision=latest_revision,
|
||||||
latest_rev=latest_rev,
|
latest_rev=latest_rev,
|
||||||
can_edit=can_edit,
|
can_edit=can_edit,
|
||||||
|
|
|
@ -14058,7 +14058,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fields": {
|
"fields": {
|
||||||
"desc": "Legacy stream",
|
"desc": "Legacy",
|
||||||
"name": "Legacy",
|
"name": "Legacy",
|
||||||
"order": 6,
|
"order": 6,
|
||||||
"used": true
|
"used": true
|
||||||
|
|
21
ietf/name/migrations/0014_change_legacy_stream_desc.py
Normal file
21
ietf/name/migrations/0014_change_legacy_stream_desc.py
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
# Copyright The IETF Trust 2024, All Rights Reserved
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
def forward(apps, schema_editor):
|
||||||
|
StreamName = apps.get_model("name", "StreamName")
|
||||||
|
StreamName.objects.filter(pk="legacy").update(desc="Legacy")
|
||||||
|
|
||||||
|
def reverse(apps, schema_editor):
|
||||||
|
StreamName = apps.get_model("name", "StreamName")
|
||||||
|
StreamName.objects.filter(pk="legacy").update(desc="Legacy stream")
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("name", "0013_narrativeminutes"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(forward, reverse)
|
||||||
|
]
|
|
@ -86,7 +86,7 @@
|
||||||
<h2 id="downrefs">Downward References</h2>
|
<h2 id="downrefs">Downward References</h2>
|
||||||
{% for ref in downrefs %}
|
{% for ref in downrefs %}
|
||||||
<p>Add {{ref.target.name}}
|
<p>Add {{ref.target.name}}
|
||||||
({{ref.target.std_level}} - {{ref.target.stream.desc}})
|
({{ref.target.std_level}} - {{ref.target.stream.desc}} stream)
|
||||||
to downref registry.<br>
|
to downref registry.<br>
|
||||||
{% if not ref.target.std_level %}
|
{% if not ref.target.std_level %}
|
||||||
+++ Warning: The standards level has not been set yet!!!<br>
|
+++ Warning: The standards level has not been set yet!!!<br>
|
||||||
|
|
|
@ -33,7 +33,7 @@ No IPR declarations have been submitted directly on this I-D.
|
||||||
{% if downrefs %}
|
{% if downrefs %}
|
||||||
The document contains these normative downward references.
|
The document contains these normative downward references.
|
||||||
See RFC 3967 for additional information:
|
See RFC 3967 for additional information:
|
||||||
{% for ref in downrefs %} {{ref.target.name}}: {{ref.target.title}} ({{ref.target.std_level}} - {{ref.target.stream.desc}})
|
{% for ref in downrefs %} {{ref.target.name}}: {{ref.target.title}} ({{ref.target.std_level}} - {{ref.target.stream.desc}} stream)
|
||||||
{% endfor %}{%endif%}
|
{% endfor %}{%endif%}
|
||||||
|
|
||||||
{% endautoescape %}
|
{% endautoescape %}
|
||||||
|
|
Loading…
Reference in a new issue