Skip to content

Commit 03e5212

Browse files
committed
Only display 'possibly replaces' information to those people who can approve it and to authors
- Legacy-Id: 9786
1 parent 7414a8e commit 03e5212

2 files changed

Lines changed: 38 additions & 28 deletions

File tree

ietf/doc/views_doc.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,11 @@ def document_main(request, name, rev=None):
156156
person__user=request.user)))
157157
can_edit_iana_state = has_role(request.user, ("Secretariat", "IANA"))
158158

159+
can_edit_replaces = has_role(request.user, ("Area Director", "Secretariat", "WG Chair", "RG Chair", "WG Secretary", "RG Secretary"))
160+
161+
is_author = unicode(request.user) in set([email.address for email in doc.authors.all()])
162+
can_view_possibly_replaces = can_edit_replaces or is_author
163+
159164
rfc_number = name[3:] if name.startswith("") else None
160165
draft_name = None
161166
for a in aliases:
@@ -357,8 +362,9 @@ def document_main(request, name, rev=None):
357362
table_rows = dict(doc=4, stream=2, iesg=4, iana=2, rfced=1)
358363
table_rows['doc'] += 1 if replaces or can_edit_stream_info else 0
359364
table_rows['doc'] += 1 if replaced_by else 0
360-
table_rows['doc'] += 1 if possibly_replaces else 0
361-
table_rows['doc'] += 1 if possibly_replaced_by else 0
365+
if can_view_possibly_replaces:
366+
table_rows['doc'] += 1 if possibly_replaces else 0
367+
table_rows['doc'] += 1 if possibly_replaced_by else 0
362368
table_rows['doc'] += 1 if doc.get_state_slug() != "rfc" else 0
363369
table_rows['doc'] += 1 if conflict_reviews else 0
364370

@@ -390,6 +396,8 @@ def document_main(request, name, rev=None):
390396
can_edit_notify=can_edit_notify,
391397
can_edit_iana_state=can_edit_iana_state,
392398
can_edit_consensus=can_edit_consensus,
399+
can_edit_replaces=can_edit_replaces,
400+
can_view_possibly_replaces=can_view_possibly_replaces,
393401

394402
rfc_number=rfc_number,
395403
draft_name=draft_name,

ietf/templates/doc/document_draft.html

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -94,32 +94,34 @@
9494
</tr>
9595
{% endif %}
9696

97-
{% if possibly_replaces %}
98-
<tr>
99-
<th>Possibly Replaces</th>
100-
<td class="edit">
101-
{% if can_edit_stream_info %}
102-
<a class="btn btn-default btn-xs" href="{% url "doc_review_possibly_replaces" name=doc.name %}">Edit</a>
103-
{% endif %}
104-
</td>
105-
<td>
106-
{{ possibly_replaces|join:", "|urlize_ietf_docs }}
107-
</td>
108-
</tr>
109-
{% endif %}
110-
111-
{% if possibly_replaced_by %}
112-
<tr>
113-
<th>Possibly Replaced By</th>
114-
<td class="edit">
115-
{% if can_edit_stream_info %}
116-
{% comment %}<a class="btn btn-default btn-xs" href="{% url "doc_review_possibly_replaces" name=doc.name %}">Edit</a>{% endcomment %}
117-
{% endif %}
118-
</td>
119-
<td>
120-
{{ possibly_replaced_by|join:", "|urlize_ietf_docs }}
121-
</td>
122-
</tr>
97+
{% if can_view_possibly_replaces %}
98+
{% if possibly_replaces %}
99+
<tr>
100+
<th>Possibly Replaces</th>
101+
<td class="edit">
102+
{% if can_edit_replaces %}
103+
<a class="btn btn-default btn-xs" href="{% url "doc_review_possibly_replaces" name=doc.name %}">Edit</a>
104+
{% endif %}
105+
</td>
106+
<td>
107+
{{ possibly_replaces|join:", "|urlize_ietf_docs }}
108+
</td>
109+
</tr>
110+
{% endif %}
111+
112+
{% if possibly_replaced_by %}
113+
<tr>
114+
<th>Possibly Replaced By</th>
115+
<td class="edit">
116+
{% if can_edit_replaces %}
117+
{% comment %}<a class="btn btn-default btn-xs" href="{% url "doc_review_possibly_replaces" name=doc.name %}">Edit</a>{% endcomment %}
118+
{% endif %}
119+
</td>
120+
<td>
121+
{{ possibly_replaced_by|join:", "|urlize_ietf_docs }}
122+
</td>
123+
</tr>
124+
{% endif %}
123125
{% endif %}
124126

125127
<tr>

0 commit comments

Comments
 (0)