Skip to content

Commit 532b3eb

Browse files
committed
Add wgchair management links into document view. Fixes ietf-tools#665
- Legacy-Id: 3133
1 parent 3628f5d commit 532b3eb

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

ietf/idtracker/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class InternetDraft(models.Model):
171171
review_by_rfc_editor = models.BooleanField()
172172
expired_tombstone = models.BooleanField()
173173
idinternal = FKAsOneToOne('idinternal', reverse=True, query=models.Q(rfc_flag = 0))
174-
shepherd = models.ForeignKey('PersonOrOrgInfo', null=True, blank=True)
174+
shepherd = BrokenForeignKey('PersonOrOrgInfo', null=True, blank=True, null_values=(0, ))
175175
def __str__(self):
176176
return self.filename
177177
def save(self, *args, **kwargs):

ietf/templates/idrfc/doc_tab_document_id.html

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,34 @@
3333
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3434
{% endcomment %}
3535

36-
{% load ietf_filters %}
36+
{% load ietf_filters ietf_streams %}
3737

3838
{% block doc_metatable %}
39-
<tr><td style="width:18ex;">Document type:</td><td>{{ info.type|escape }}
39+
<tr><td>Document Stream:</td><td> {{ stream_info.stream.name|default:"No stream defined" }}</td></tr>
40+
<tr><td>I-D availability status:</td><td> {{ doc.draft_status }}
41+
{% ifequal doc.draft_status "Expired" %}
42+
{% if doc.resurrect_requested_by %}(resurrect requested by {{ doc.resurrect_requested_by }}){% endif %}
43+
{% endifequal %}
4044
{% with doc.replaces as r %}{% if r %}<br />Replaces {% filter urlize_ietf_docs %}{{ r|join:", "}}{% endfilter %}{% endif %}{% endwith %}
4145
</td></tr>
4246
<tr><td>Last updated:</td><td> {{ doc.publication_date|default:"(data missing)" }}</td></tr>
43-
<tr><td><a href="/idtracker/help/state/">State</a>:</td><td>
44-
{{ doc.friendly_state|safe }}
47+
{% ifequal stream_info.stream.name "IETF" %}<tr><td>IETF WG status:</td><td>{{ stream_info.state.name }} ({{ stream_info.streamed.group }})
48+
{% if stream_info.tags %}<br /><i>{% for tag in stream_info.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}
49+
</td></tr>
50+
{% else %}
51+
{% if stream_info.stream %}<tr><td>{{ stream_info.stream.name }} status:</td><td>{{ stream_info.state.name }} {% if stream_info.streamed.group %}({{ stream_info.streamed.group }}) {% endif %}
52+
{% if stream_info.tags %}<br /><i>{% for tag in stream_info.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}
53+
</td></tr>{% endif %}
54+
{% endifequal %}
55+
<tr><td>Intended RFC status:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.intended_maturity_level|default:"-" }}{% else %}-{%endif%}</td></tr>
56+
<tr><td>Document shepherd:</td><td>{{ stream_info.shepherd|default:"" }}</td></tr>
57+
<tr><td><a href="/idtracker/help/state/">IESG State</>:</td><td> {{ doc.friendly_state|safe }}
4558
{% if doc.rfc_editor_state %}<br />RFC Editor State: <a href="http://www.rfc-editor.org/queue2.html#{{doc.draft_name}}">{{ doc.rfc_editor_state|escape }}</a>{% endif %}
4659
{% ifequal doc.draft_status "Expired" %}
4760
{% if doc.resurrect_requested_by %}(resurrect requested by {{ doc.resurrect_requested_by }}){% endif %}
4861
{% endifequal %}
4962
{% if doc.in_ietf_process %}{% if doc.ietf_process.telechat_date %}<br/>On agenda of {{ doc.ietf_process.telechat_date }} IESG telechat {% if doc.ietf_process.telechat_returning_item %} (returning item){%endif%}{%endif%}{% if doc.ietf_process.has_active_iesg_ballot %}<br/><i>({{ doc.ietf_process.iesg_ballot_needed }})</i>{%endif%}{%endif%}
5063
</td></tr>
51-
<tr><td>Intended status:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.intended_maturity_level|default:"-" }}{% else %}-{%endif%}</td></tr>
5264
<tr><td>Submission:</td><td>{{ doc.submission }}</td></tr>
5365
<tr><td>Responsible AD:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.ad_name|default:"-"|escape }}{%else%}-{%endif%}</td></tr>
5466
{% if doc.in_ietf_process and doc.ietf_process.iesg_note %}<tr><td>IESG Note:</td><td>{{ doc.ietf_process.iesg_note|format_textarea|safe }}</td></tr>{% endif %}
@@ -73,6 +85,7 @@
7385
{% endblock doc_metatable %}
7486

7587
{% block doc_metalinks %}
88+
{% edit_actions doc %}
7689
<div>
7790
<a href="mailto:{{doc.draft_name}}@tools.ietf.org?subject=Mail%20regarding%20{{doc.draft_name}}" rel="nofollow">Email Authors</a>
7891
| <a href="/ipr/search/?option=document_search&amp;id_document_tag={{doc.tracker_id}}" rel="nofollow">IPR Disclosures</a>

0 commit comments

Comments
 (0)