Skip to content

Commit 7a406ba

Browse files
committed
Polish the various review pages, adding bits of information here and
there - Legacy-Id: 11363
1 parent 0ed3d55 commit 7a406ba

5 files changed

Lines changed: 29 additions & 3 deletions

File tree

ietf/doc/views_doc.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,13 +577,16 @@ def document_main(request, name, rev=None):
577577
pathname = os.path.join(doc.get_file_path(), basename)
578578
content = get_document_content(basename, pathname, split=False)
579579

580+
review_req = ReviewRequest.objects.filter(review=doc.name).first()
581+
580582
return render(request, "doc/document_review.html",
581583
dict(doc=doc,
582584
top=top,
583585
content=content,
584586
revisions=revisions,
585587
latest_rev=latest_rev,
586588
snapshot=snapshot,
589+
review_req=review_req,
587590
))
588591

589592
raise Http404

ietf/templates/doc/document_draft.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,11 @@
200200
<td>
201201
{% for r in review_requests %}
202202
<div>
203-
<a href="{% url "ietf.doc.views_review.review_request" doc.name r.pk %}">{{ r.team.acronym|upper }} {{ r.type.name }} Review {% if r.reviewed_rev and r.reviewed_rev != doc.rev %}of rev. <b>{{ r.reviewed_rev }}</b>{% endif %} ({{ r.state.name }})</a>
203+
{% if r.state_id == "completed" or r.state_id == "part-completed" %}
204+
<a href="{% url "doc_view" r.review.name %}">{{ r.team.acronym|upper }} {{ r.type.name }} Review{% if r.reviewed_rev and r.reviewed_rev != doc.rev %} (of -{{ r.reviewed_rev }}){% endif %}: {{ r.result.name }}</a>
205+
{% else %}
206+
<a href="{% url "ietf.doc.views_review.review_request" doc.name r.pk %}">{{ r.team.acronym|upper }} {{ r.type.name }} Review ({{ r.state.name }})</a>
207+
{% endif %}
204208
</div>
205209
{% endfor %}
206210

ietf/templates/doc/document_review.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@
4949
<td>{{ doc.get_state.name }}</td>
5050
</tr>
5151

52+
{% if review_req %}
53+
<tr>
54+
<th>Review result</th>
55+
<td class="edit"></td>
56+
<td><a href="{% url "ietf.doc.views_review.review_request" review_req.doc.name review_req.pk %}">{{ review_req.result.name }}</a></td>
57+
</tr>
58+
{% endif %}
59+
5260
{% if doc.external_url %}
5361
<tr>
5462
<th>Posted at</th>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% autoescape off %}{% filter wordwrap:70 %}{% if review_req.state_id == "part-completed" %}Review is partially done. Another review request has been registered for completing it.
22

33
{% endif %}Reviewer: {{ review_req.reviewer.person }}
4+
Review result: {{ review_req.result.name }}
45

56
{{ content }}
67
{% endfilter %}{% endautoescape %}

ietf/templates/doc/review/review_request.html

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,28 @@ <h1>Review request<br><small>{{ review_req.doc.name }}</small></h1>
104104
</td>
105105
</tr>
106106

107+
{% if review_req.review and review_req.review.external_url %}
108+
<tr>
109+
<th></th>
110+
<th>Posted at</th>
111+
<td>
112+
<a href="{{ review_req.review.external_url }}">{{ review_req.review.external_url }}</a>
113+
</td>
114+
</tr>
115+
{% endif %}
116+
107117
{% if review_req.reviewed_rev %}
108118
<tr>
109119
<th></th>
110-
<th>Reviewed revision</th>
120+
<th>Reviewed rev.</th>
111121
<td><a href="{% url "doc_view" name=review_req.doc.name rev=review_req.reviewed_rev %}">{{ review_req.reviewed_rev }}</a> {% if review_req.reviewed_rev != review_req.doc.rev %}(currently at {{ review_req.doc.rev }}){% endif %}</td>
112122
</tr>
113123
{% endif %}
114124

115125
{% if review_req.result %}
116126
<tr>
117127
<th></th>
118-
<th>Result of review</th>
128+
<th>Review result</th>
119129
<td>{{ review_req.result.name }}</td>
120130
</tr>
121131
{% endif %}

0 commit comments

Comments
 (0)