Skip to content

Commit 3252183

Browse files
committed
Merged in [16087] from housley@vigilsec.com:
Add downward references to telechat moderator package and Secretariat telechat pages. - Legacy-Id: 16093 Note: SVN reference [16087] has been migrated to Git commit 268b99b
2 parents f635b2f + 268b99b commit 3252183

5 files changed

Lines changed: 45 additions & 4 deletions

File tree

ietf/iesg/views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,11 @@ def leaf_section(num, section):
257257
for num, s in sections:
258258
if "2" <= num < "5" and "docs" in s and s["docs"]:
259259
for i, d in enumerate(s["docs"], start=1):
260+
downrefs = [rel for rel in d.relateddocument_set.all() if rel.is_downref() and not rel.is_approved_downref()]
260261
flattened_sections.append((num, {
261262
"title": s["title"] + " (%s of %s)" % (i, len(s["docs"])),
262263
"doc": d,
264+
"downrefs": downrefs,
263265
"parents": s["parents"],
264266
}))
265267
else:

ietf/secr/telechat/views.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ def doc_detail(request, date, name):
202202
tags = doc.tags.filter(slug__in=TELECHAT_TAGS)
203203
tag = tags[0].pk if tags else None
204204

205+
downrefs = [rel for rel in doc.relateddocument_set.all() if rel.is_downref() and not rel.is_approved_downref()]
206+
205207
writeup = get_doc_writeup(doc)
206208

207209
initial_state = {'state':doc.get_state(state_type).pk,
@@ -304,6 +306,7 @@ def doc_detail(request, date, name):
304306
'ballot_type': ballot_type,
305307
'date': date,
306308
'document': doc,
309+
'downrefs': downrefs,
307310
'conflictdoc': conflictdoc,
308311
'agenda': agenda,
309312
'formset': formset,

ietf/secr/templates/telechat/doc.html

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ <h3>{{ document.name }}-{{ document.rev }} ({{ document.intended_std_level }})</
2121
{% if conflictdoc %}References: <a href="{{ conflictdoc.get_absolute_url }}">{{ conflictdoc }}</a><br />{% endif %}
2222
<a href="#writeup">Ballot Writeup</a><br />
2323
Token: {{ document.ad.name }}<br />
24-
{% if document.type_id == "draft" %}Consensus: {{ document|consensus }}<br />{% endif %}
24+
{% if document.type_id == "draft" %}
25+
Consensus: {{ document|consensus }}<br />
26+
Has downref: {% if downrefs %}Yes{% else %}No{% endif %}<br />
27+
{% endif %}
2528
Number of Open Positions: {{ open_positions }}<br />
2629
<br />
2730
<div>
@@ -73,7 +76,21 @@ <h3>{{ document.name }}-{{ document.rev }} ({{ document.intended_std_level }})</
7376
<pre>
7477
{{ writeup }}
7578
</pre>
76-
79+
80+
{% if downrefs %}
81+
<a name="downrefs"><h2>Downward References</h2></a>
82+
{% for ref in downrefs %}
83+
<p>Add {{ref.target.document.canonical_name}}
84+
({{ref.target.document.std_level}} - {{ref.target.document.stream.desc}})
85+
to downref registry.<br />
86+
{% if not ref.target.document.std_level %}
87+
+++ Warning: The standards level has not been set yet!!!<br />
88+
{% endif %}
89+
{% if not ref.target.document.stream %}
90+
+++ Warning: document stream has not been set yet!!!<br />
91+
{% endif %}
92+
{% endfor %}</p>
93+
{% endif %}
7794

7895
{% else %}
7996
<h3>No Documents on the Agenda</h3>

ietf/templates/iesg/moderator_doc.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<b>
4444
Intended status: {{ doc.intended_std_level }}<br>
4545
Consensus: <a href="{% url 'ietf.doc.views_draft.edit_consensus' name=doc.name %}">{{ doc|consensus }}</a><br>
46+
Has downref: {% if downrefs %}Yes{% else %}No{% endif %}<br>
4647
Token: {{ doc.ad.plain_name }}<br>
4748
{% if doc.type_id == "draft" %}
4849
Last call ends: {{ doc.most_recent_ietflc.expires.date|default:"(none)" }}
@@ -159,3 +160,21 @@
159160
the Do Not Publish message to the RFC Editor that includes the note
160161
drafted by[Name the AD].</p>
161162
{% endif %}
163+
164+
{% if num|startswith:"2.1" or num|startswith:"2.2" %}
165+
{% if downrefs %}
166+
<p>If APPROVED - The Secretariat will add to the downref registry:<br>
167+
{% for ref in downrefs %}
168+
+ Add {{ref.target.document.canonical_name}}
169+
({{ref.target.document.std_level}} - {{ref.target.document.stream.desc}})
170+
to downref registry.<br>
171+
{% if not ref.target.document.std_level %}
172+
+++ Warning: The standards level has not been set yet!!!<br>
173+
{% endif %}
174+
{% if not ref.target.document.stream %}
175+
+++ Warning: document stream has not been set yet!!!<br>
176+
{% endif %}
177+
{% endfor %}</p>
178+
{% endif %}
179+
{% endif %}
180+

ietf/templates/iesg/moderator_package.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ <h3>{% for parent_num, parent_section in section.parents %}{{ parent_num }}{% if
9797

9898
{% if num >= "2" and num < "5" %}
9999
{% if "doc" in section %}
100-
{% with section.doc as doc %}
100+
{% with section.doc as doc %}{% with section.downrefs as downrefs %}
101101
{% if doc.type_id == "draft" or doc.type_id == "statchg" %}{% include "iesg/moderator_doc.html" %}{% endif %}
102102
{% if doc.type_id == "conflrev" %}{% include "iesg/moderator_conflict_doc.html" %}{% endif %}
103103
{% if doc.type_id == "charter" %}{% include "iesg/moderator_charter.html" %}{% endif %}
104-
{% endwith %}
104+
{% endwith %}{% endwith %}
105105
{% else %}
106106
<p>NONE</p>
107107
{% endif %}

0 commit comments

Comments
 (0)