Skip to content

Commit 3bfb930

Browse files
rjsparksrjsparks
authored
fix: appropriate metadata for editorial stream docs (#7195)
1 parent b21706e commit 3bfb930

File tree

2 files changed

+130
-118
lines changed

2 files changed

+130
-118
lines changed

‎ietf/doc/tests_draft.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import debug # pyflakes:ignore
2121

2222
from ietf.doc.expire import get_expired_drafts, send_expire_notice_for_draft, expire_draft
23-
from ietf.doc.factories import IndividualDraftFactory, WgDraftFactory, RgDraftFactory, DocEventFactory
23+
from ietf.doc.factories import EditorialDraftFactory, IndividualDraftFactory, WgDraftFactory, RgDraftFactory, DocEventFactory
2424
from ietf.doc.models import ( Document, DocReminder, DocEvent,
2525
ConsensusDocEvent, LastCallDocEvent, RelatedDocument, State, TelechatDocEvent,
2626
WriteupDocEvent, DocRelationshipName, IanaExpertDocEvent )
@@ -2161,3 +2161,13 @@ def test_shepherd_writeup_generation(self):
21612161
self.assertContains(r, "for Group Documents", status_code=200)
21622162
r = self.client.post(url,dict(reset_text=''))
21632163
self.assertContains(r, "for Group Documents", status_code=200)
2164+
2165+
class EditorialDraftMetadataTests(TestCase):
2166+
def test_editorial_metadata(self):
2167+
draft = EditorialDraftFactory()
2168+
url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))
2169+
r = self.client.get(url)
2170+
q = PyQuery(r.content)
2171+
top_level_metadata_headings = q("tbody>tr>th:first-child").text()
2172+
self.assertNotIn("IESG", top_level_metadata_headings)
2173+
self.assertNotIn("IANA", top_level_metadata_headings)

‎ietf/templates/doc/document_draft.html

Lines changed: 119 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
</tr>
268268
{% endif %}
269269
</tbody>
270-
{% if not doc.stream_id == 'iab' %}
270+
{% if doc.stream_id != 'iab' and doc.stream_id != 'editorial' %}
271271
<tbody class="meta border-top">
272272
<tr>
273273
<th scope="row">
@@ -447,125 +447,127 @@
447447
</tr>
448448
</tbody>
449449
{% endif %}
450-
{% if can_edit_iana_state or iana_review_state or iana_experts_state or iana_experts_comment %}
451-
<tbody class="meta border-top">
452-
{% if iana_review_state or can_edit_iana_state %}
453-
<tr>
454-
<th scope="row">
455-
IANA
456-
</th>
457-
<th scope="row">
458-
<a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-review" %}">
459-
IANA review state
460-
</a>
461-
</th>
462-
<td class="edit">
463-
{% if can_edit_iana_state and not snapshot %}
464-
<a class="btn btn-primary btn-sm"
465-
href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-review" %}">
466-
Edit
467-
</a>
468-
{% endif %}
469-
</td>
470-
<td class="{% if iana_review_state|slugify|slice:7 != "iana-ok" %}text-danger{% else %}text-success{% endif %}">
471-
{% if not iana_review_state %}
472-
<span class="text-body-secondary">
473-
(None)
474-
</span>
475-
{% else %}
476-
{{ iana_review_state }}
477-
{% endif %}
478-
</td>
479-
</tr>
480-
{% endif %}
481-
{% if iana_action_state or can_edit_iana_state %}
482-
<tr>
483-
<th scope="row">
484-
{% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %}
485-
</th>
486-
<th scope="row">
487-
<a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-action" %}">
488-
IANA action state
489-
</a>
490-
</th>
491-
<td class="edit">
492-
{% if can_edit_iana_state and not snapshot %}
493-
<a class="btn btn-primary btn-sm"
494-
href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-action" %}">
495-
Edit
450+
{% if doc.stream_id != 'editorial' %}
451+
{% if can_edit_iana_state or iana_review_state or iana_experts_state or iana_experts_comment %}
452+
<tbody class="meta border-top">
453+
{% if iana_review_state or can_edit_iana_state %}
454+
<tr>
455+
<th scope="row">
456+
IANA
457+
</th>
458+
<th scope="row">
459+
<a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-review" %}">
460+
IANA review state
496461
</a>
497-
{% endif %}
498-
</td>
499-
<td>
500-
{% if not iana_action_state %}
501-
<span class="text-body-secondary">
502-
(None)
503-
</span>
504-
{% else %}
505-
{{ iana_action_state }}
506-
{% endif %}
507-
</td>
508-
</tr>
509-
{% endif %}
510-
{% if iana_experts_state or can_edit_iana_state %}
511-
<tr>
512-
<th scope="row">
513-
{% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %}
514-
</th>
515-
<th scope="row">
516-
<a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-experts" %}">
517-
IANA expert review state
518-
</a>
519-
</th>
520-
<td class="edit">
521-
{% if can_edit_iana_state and not snapshot %}
522-
<a class="btn btn-primary btn-sm"
523-
href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-experts" %}">
524-
Edit
462+
</th>
463+
<td class="edit">
464+
{% if can_edit_iana_state and not snapshot %}
465+
<a class="btn btn-primary btn-sm"
466+
href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-review" %}">
467+
Edit
468+
</a>
469+
{% endif %}
470+
</td>
471+
<td class="{% if iana_review_state|slugify|slice:7 != "iana-ok" %}text-danger{% else %}text-success{% endif %}">
472+
{% if not iana_review_state %}
473+
<span class="text-body-secondary">
474+
(None)
475+
</span>
476+
{% else %}
477+
{{ iana_review_state }}
478+
{% endif %}
479+
</td>
480+
</tr>
481+
{% endif %}
482+
{% if iana_action_state or can_edit_iana_state %}
483+
<tr>
484+
<th scope="row">
485+
{% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %}
486+
</th>
487+
<th scope="row">
488+
<a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-action" %}">
489+
IANA action state
525490
</a>
526-
{% endif %}
527-
</td>
528-
<td class="{% if iana_experts_state|slugify|slice:"-2:" != "ok" %}text-danger{% else %}text-success{% endif %}">
529-
{% if not iana_experts_state %}
530-
<span class="text-body-secondary">
531-
(None)
532-
</span>
533-
{% else %}
534-
{{ iana_experts_state }}
535-
{% endif %}
536-
</td>
537-
</tr>
538-
{% endif %}
539-
{% if iana_experts_comment or can_edit_iana_state %}
540-
<tr>
541-
<th scope="row">
542-
{% if not can_edit_iana_state and not iana_review_state and not iana_action_state and not iana_experts_state %}
543-
IANA
544-
{% endif %}
545-
</th>
546-
<th scope="row">
547-
IANA expert review comments
548-
</th>
549-
<td class="edit">
550-
{% if can_edit_iana_state and not snapshot %}
551-
<a class="btn btn-primary btn-sm"
552-
href="{% url 'ietf.doc.views_draft.add_iana_experts_comment' name=doc.name %}">
553-
Edit
491+
</th>
492+
<td class="edit">
493+
{% if can_edit_iana_state and not snapshot %}
494+
<a class="btn btn-primary btn-sm"
495+
href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-action" %}">
496+
Edit
497+
</a>
498+
{% endif %}
499+
</td>
500+
<td>
501+
{% if not iana_action_state %}
502+
<span class="text-body-secondary">
503+
(None)
504+
</span>
505+
{% else %}
506+
{{ iana_action_state }}
507+
{% endif %}
508+
</td>
509+
</tr>
510+
{% endif %}
511+
{% if iana_experts_state or can_edit_iana_state %}
512+
<tr>
513+
<th scope="row">
514+
{% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %}
515+
</th>
516+
<th scope="row">
517+
<a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-experts" %}">
518+
IANA expert review state
554519
</a>
555-
{% endif %}
556-
</td>
557-
<td>
558-
{% if not iana_experts_comment %}
559-
<span class="text-body-secondary">
560-
(None)
561-
</span>
562-
{% else %}
563-
{{ iana_experts_comment }}
564-
{% endif %}
565-
</td>
566-
</tr>
567-
{% endif %}
568-
</tbody>
520+
</th>
521+
<td class="edit">
522+
{% if can_edit_iana_state and not snapshot %}
523+
<a class="btn btn-primary btn-sm"
524+
href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-experts" %}">
525+
Edit
526+
</a>
527+
{% endif %}
528+
</td>
529+
<td class="{% if iana_experts_state|slugify|slice:"-2:" != "ok" %}text-danger{% else %}text-success{% endif %}">
530+
{% if not iana_experts_state %}
531+
<span class="text-body-secondary">
532+
(None)
533+
</span>
534+
{% else %}
535+
{{ iana_experts_state }}
536+
{% endif %}
537+
</td>
538+
</tr>
539+
{% endif %}
540+
{% if iana_experts_comment or can_edit_iana_state %}
541+
<tr>
542+
<th scope="row">
543+
{% if not can_edit_iana_state and not iana_review_state and not iana_action_state and not iana_experts_state %}
544+
IANA
545+
{% endif %}
546+
</th>
547+
<th scope="row">
548+
IANA expert review comments
549+
</th>
550+
<td class="edit">
551+
{% if can_edit_iana_state and not snapshot %}
552+
<a class="btn btn-primary btn-sm"
553+
href="{% url 'ietf.doc.views_draft.add_iana_experts_comment' name=doc.name %}">
554+
Edit
555+
</a>
556+
{% endif %}
557+
</td>
558+
<td>
559+
{% if not iana_experts_comment %}
560+
<span class="text-body-secondary">
561+
(None)
562+
</span>
563+
{% else %}
564+
{{ iana_experts_comment }}
565+
{% endif %}
566+
</td>
567+
</tr>
568+
{% endif %}
569+
</tbody>
570+
{% endif %}
569571
{% endif %}
570572
{% if rfc_editor_state %}
571573
<tbody class="meta border-top">

0 commit comments

Comments
 (0)