Skip to content

Commit 93797b3

Browse files
author
Sasha Romijn
committed
Fix ietf-tools#2087 - Show doc authors and WG chairs in unassigned reviews views.
Commit ready for merge. - Legacy-Id: 16923
1 parent fd53f98 commit 93797b3

6 files changed

Lines changed: 35 additions & 2 deletions

File tree

ietf/doc/tests_review.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ def test_doc_page(self):
160160
self.assertContains(r, "{} Review".format(review_req.type.name))
161161

162162
def test_review_request(self):
163-
doc = WgDraftFactory(group__acronym='mars',rev='01')
163+
author = PersonFactory()
164+
doc = WgDraftFactory(group__acronym='mars',rev='01', authors=[author])
164165
review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
165166
rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
166167
review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
@@ -171,6 +172,7 @@ def test_review_request(self):
171172
r = self.client.get(url)
172173
self.assertContains(r, review_req.team.acronym)
173174
self.assertContains(r, review_req.team.name)
175+
self.assertContains(r, author.name)
174176

175177
url = urlreverse('ietf.doc.views_review.review_request_forced_login', kwargs={ "name": doc.name, "request_id": review_req.pk })
176178
r = self.client.get(url)

ietf/doc/views_review.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ def review_request(request, name, request_id):
223223
assignment.save()
224224
return redirect(review_request, name=review_req.doc.name, request_id=review_req.pk)
225225

226+
wg_chairs = None
227+
if review_req.doc.group:
228+
wg_chairs = [role.person for role in review_req.doc.group.role_set.filter(name__slug='chair')]
229+
226230
return render(request, 'doc/review/review_request.html', {
227231
'doc': doc,
228232
'review_req': review_req,
@@ -231,6 +235,7 @@ def review_request(request, name, request_id):
231235
'can_edit_comment': can_edit_comment,
232236
'can_edit_deadline': can_edit_deadline,
233237
'assignments': assignments,
238+
'wg_chairs': wg_chairs,
234239
})
235240

236241

ietf/group/tests_review.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ def test_manage_review_requests(self):
185185
group = ReviewTeamFactory()
186186
RoleFactory(name_id='reviewer',group=group,person__user__username='reviewer').person
187187
marsperson = RoleFactory(name_id='reviewer',group=group,person=PersonFactory(name="Mars Anders Chairman",user__username='marschairman')).person
188-
review_req1 = ReviewRequestFactory(doc__pages=2,doc__shepherd=marsperson.email(),team=group)
188+
doc_author = PersonFactory()
189+
review_req1 = ReviewRequestFactory(doc__pages=2,doc__shepherd=marsperson.email(),team=group, doc__authors=[doc_author])
189190
review_req2 = ReviewRequestFactory(team=group)
190191
review_req3 = ReviewRequestFactory(team=group)
191192
RoleFactory(name_id='chair',group=review_req1.doc.group,person=marsperson)
@@ -205,6 +206,7 @@ def test_manage_review_requests(self):
205206
r = self.client.get(unassigned_url)
206207
self.assertEqual(r.status_code, 200)
207208
self.assertContains(r, review_req1.doc.name)
209+
self.assertContains(r, doc_author.name)
208210

209211
# Test that conflicts are detected
210212
r = self.client.post(unassigned_url, {

ietf/group/views.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,9 @@ def manage_review_requests(request, acronym, group_type=None, assignment_status=
14931493
augment_review_requests_with_events(l)
14941494

14951495
req.latest_reqs = l
1496+
req.wg_chairs = None
1497+
if req.doc.group:
1498+
req.wg_chairs = [role.person for role in req.doc.group.role_set.filter(name__slug='chair')]
14961499

14971500
saving = False
14981501
newly_closed = newly_opened = newly_assigned = 0

ietf/templates/doc/review/request_info.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,22 @@
6868
</tr>
6969
{% endif %}
7070

71+
{% if review_req.doc.authors %}
72+
<tr>
73+
<th></th>
74+
<th>Authors</th>
75+
<td>{{ review_req.doc.authors|join:", " }}</td>
76+
</tr>
77+
{% endif %}
78+
79+
{% if wg_chairs %}
80+
<tr>
81+
<th></th>
82+
<th>WG chairs</th>
83+
<td>{{ wg_chairs|join:", " }}</td>
84+
</tr>
85+
{% endif %}
86+
7187
{% if doc.time %}
7288
<tr>
7389
<th></th>

ietf/templates/group/manage_review_requests.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ <h3 class="panel-title">
5656
Auto-suggested
5757
{% endif %}
5858
</p>
59+
<p>
60+
{% if r.doc.authors %}Authors: {{ r.doc.authors|join:", " }}{% endif %}
61+
<br>
62+
{% if r.wg_chairs %}WG chairs: {{ r.wg_chairs|join:", " }}{% endif %}
63+
</p>
5964

6065
{% if r.latest_reqs %}
6166
{% for rlatest in r.latest_reqs %}

0 commit comments

Comments
 (0)