diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py index a8b9ebf6d..1fa44b845 100644 --- a/ietf/doc/tests_review.py +++ b/ietf/doc/tests_review.py @@ -64,6 +64,7 @@ class ReviewTests(TestCase): "deadline": deadline.isoformat(), "requested_rev": "01", "requested_by": Person.objects.get(user__username="reviewsecretary").pk, + "comment": "gZT2iiYqYLKiQHvsgWCcVLdH" }) self.assertEqual(r.status_code, 302) @@ -74,6 +75,7 @@ class ReviewTests(TestCase): self.assertEqual(req.deadline, deadline) self.assertEqual(req.requested_rev, "01") self.assertEqual(doc.latest_event().type, "requested_review") + self.assertEqual(req.comment, "gZT2iiYqYLKiQHvsgWCcVLdH") def test_doc_page(self): diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py index 0e4bd298d..6d926748e 100644 --- a/ietf/doc/views_review.py +++ b/ietf/doc/views_review.py @@ -46,7 +46,7 @@ class RequestReviewForm(forms.ModelForm): class Meta: model = ReviewRequest - fields = ('requested_by', 'type', 'deadline', 'requested_rev') + fields = ('requested_by', 'type', 'deadline', 'requested_rev', 'comment') def __init__(self, user, doc, *args, **kwargs): super(RequestReviewForm, self).__init__(*args, **kwargs) @@ -62,6 +62,8 @@ class RequestReviewForm(forms.ModelForm): self.fields["requested_rev"].label = "Document revision" + self.fields["comment"].widget = forms.Textarea() + if has_role(user, "Secretariat"): self.fields["requested_by"] = SearchablePersonField() else: diff --git a/ietf/review/admin.py b/ietf/review/admin.py index a706fc744..22da2df81 100644 --- a/ietf/review/admin.py +++ b/ietf/review/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin +from django import forms from ietf.review.models import (ReviewerSettings, UnavailablePeriod, ReviewWish, NextReviewerInTeam, ReviewRequest, ReviewTeamSettings ) @@ -43,7 +44,14 @@ class NextReviewerInTeamAdmin(admin.ModelAdmin): admin.site.register(NextReviewerInTeam, NextReviewerInTeamAdmin) +class ReviewRequestAdminForm( forms.ModelForm ): + comment = forms.CharField(widget=forms.Textarea) + class Meta: + exclude = [] + model = ReviewRequest + class ReviewRequestAdmin(admin.ModelAdmin): + form = ReviewRequestAdminForm list_display = ["doc", "time", "type", "team", "deadline"] list_display_links = ["doc"] list_filter = ["team", "type", "state", "result"] diff --git a/ietf/review/migrations/0010_reviewrequest_comment.py b/ietf/review/migrations/0010_reviewrequest_comment.py new file mode 100644 index 000000000..ce8dc93ae --- /dev/null +++ b/ietf/review/migrations/0010_reviewrequest_comment.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('review', '0009_auto_20161214_1537'), + ] + + operations = [ + migrations.AddField( + model_name='reviewrequest', + name='comment', + field=models.CharField(default=b'', help_text=b'Provide any additional information to show to the review team secretary and reviewer', max_length=2048, verbose_name=b"Requester's comments and instructions", blank=True), + ), + ] diff --git a/ietf/review/models.py b/ietf/review/models.py index 2d1176867..d74653fe3 100644 --- a/ietf/review/models.py +++ b/ietf/review/models.py @@ -115,6 +115,7 @@ class ReviewRequest(models.Model): deadline = models.DateField() requested_by = models.ForeignKey(Person) requested_rev = models.CharField(verbose_name="requested revision", max_length=16, blank=True, help_text="Fill in if a specific revision is to be reviewed, e.g. 02") + comment = models.CharField(verbose_name="Requester's comments and instructions", max_length=2048, blank=True, help_text="Provide any additional information to show to the review team secretary and reviewer", default='') # Fields filled in as reviewer is assigned and as the review is # uploaded. Once these are filled in and we progress beyond being diff --git a/ietf/templates/doc/review/request_review.html b/ietf/templates/doc/review/request_review.html index 39625ca64..79d64df13 100644 --- a/ietf/templates/doc/review/request_review.html +++ b/ietf/templates/doc/review/request_review.html @@ -35,6 +35,7 @@ {% bootstrap_field form.team layout="horizontal" %} {% bootstrap_field form.deadline layout="horizontal" %} {% bootstrap_field form.requested_rev layout="horizontal" %} + {% bootstrap_field form.comment layout="horizontal" %} {% buttons %} diff --git a/ietf/templates/doc/review/review_request.html b/ietf/templates/doc/review/review_request.html index 1adf98bbe..f33fa866b 100644 --- a/ietf/templates/doc/review/review_request.html +++ b/ietf/templates/doc/review/review_request.html @@ -66,6 +66,14 @@
{{review_req.comment}}
{{ r.comment }}