Polish the various review pages, adding bits of information here and
there - Legacy-Id: 11363
This commit is contained in:
parent
0ed3d554d6
commit
7a406bafc6
|
@ -577,6 +577,8 @@ def document_main(request, name, rev=None):
|
|||
pathname = os.path.join(doc.get_file_path(), basename)
|
||||
content = get_document_content(basename, pathname, split=False)
|
||||
|
||||
review_req = ReviewRequest.objects.filter(review=doc.name).first()
|
||||
|
||||
return render(request, "doc/document_review.html",
|
||||
dict(doc=doc,
|
||||
top=top,
|
||||
|
@ -584,6 +586,7 @@ def document_main(request, name, rev=None):
|
|||
revisions=revisions,
|
||||
latest_rev=latest_rev,
|
||||
snapshot=snapshot,
|
||||
review_req=review_req,
|
||||
))
|
||||
|
||||
raise Http404
|
||||
|
|
|
@ -200,7 +200,11 @@
|
|||
<td>
|
||||
{% for r in review_requests %}
|
||||
<div>
|
||||
<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>
|
||||
{% if r.state_id == "completed" or r.state_id == "part-completed" %}
|
||||
<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>
|
||||
{% else %}
|
||||
<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>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
|
|
|
@ -49,6 +49,14 @@
|
|||
<td>{{ doc.get_state.name }}</td>
|
||||
</tr>
|
||||
|
||||
{% if review_req %}
|
||||
<tr>
|
||||
<th>Review result</th>
|
||||
<td class="edit"></td>
|
||||
<td><a href="{% url "ietf.doc.views_review.review_request" review_req.doc.name review_req.pk %}">{{ review_req.result.name }}</a></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{% if doc.external_url %}
|
||||
<tr>
|
||||
<th>Posted at</th>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{% 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.
|
||||
|
||||
{% endif %}Reviewer: {{ review_req.reviewer.person }}
|
||||
Review result: {{ review_req.result.name }}
|
||||
|
||||
{{ content }}
|
||||
{% endfilter %}{% endautoescape %}
|
||||
|
|
|
@ -104,10 +104,20 @@
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
{% if review_req.review and review_req.review.external_url %}
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Posted at</th>
|
||||
<td>
|
||||
<a href="{{ review_req.review.external_url }}">{{ review_req.review.external_url }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{% if review_req.reviewed_rev %}
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Reviewed revision</th>
|
||||
<th>Reviewed rev.</th>
|
||||
<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>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
@ -115,7 +125,7 @@
|
|||
{% if review_req.result %}
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Result of review</th>
|
||||
<th>Review result</th>
|
||||
<td>{{ review_req.result.name }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
|
Loading…
Reference in a new issue