From f1a39bf7a0ea7d912116e86d17708994fb9eb98a Mon Sep 17 00:00:00 2001
From: Erin Mullaney <erin.mullaney@torchbox.com>
Date: Wed, 20 Feb 2019 10:44:41 -0500
Subject: [PATCH] #962 display review opinions on all reviews page for a
submission
---
opentech/apply/review/models.py | 3 +--
opentech/apply/review/views.py | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opentech/apply/review/models.py b/opentech/apply/review/models.py
index 59f4b19b3..5e4c2bd9b 100644
--- a/opentech/apply/review/models.py
+++ b/opentech/apply/review/models.py
@@ -187,5 +187,4 @@ class ReviewOpinion(models.Model):
def get_author_role(self):
role = self.review.submission.assigned.with_roles().filter(reviewer=self.author).first()
- role = role.role if role else None
- return role
+ return role.role if role else None
diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py
index 477899310..bcfc7155b 100644
--- a/opentech/apply/review/views.py
+++ b/opentech/apply/review/views.py
@@ -243,6 +243,7 @@ class ReviewListView(ListView):
# Add the header rows
review_data['title'] = {'question': '', 'answers': list()}
+ review_data['opinions'] = {'question': 'Opinions', 'answers': list()}
review_data['score'] = {'question': 'Overall Score', 'answers': list()}
review_data['recommendation'] = {'question': 'Recommendation', 'answers': list()}
review_data['revision'] = {'question': 'Revision', 'answers': list()}
@@ -252,6 +253,10 @@ class ReviewListView(ListView):
for i, review in enumerate(self.object_list):
review_data['title']['answers'].append('<a href="{}">{}</a>'.format(review.get_absolute_url(), review.author))
+ opinions = ''
+ for opinion in review.opinions.all():
+ opinions += '<li>{} {}s</li>'.format(opinion.author, opinion.get_opinion_display())
+ review_data['opinions']['answers'].append('<ul>{}</ul>'.format(opinions))
review_data['score']['answers'].append(str(review.get_score_display()))
review_data['recommendation']['answers'].append(review.get_recommendation_display())
review_data['comments']['answers'].append(review.get_comments_display(include_question=False))
--
GitLab