From 3d4b0fb19ecea87e39bac154e144883febe7e47a Mon Sep 17 00:00:00 2001
From: Erin Mullaney <erin.mullaney@torchbox.com>
Date: Wed, 20 Feb 2019 11:13:45 -0500
Subject: [PATCH] GH-962 use the review opinions template on the all reviews
page
---
.../apply/review/templates/review/review_list.html | 6 +++++-
opentech/apply/review/views.py | 11 +++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/opentech/apply/review/templates/review/review_list.html b/opentech/apply/review/templates/review/review_list.html
index a8bdbdf55..f6e14a15e 100644
--- a/opentech/apply/review/templates/review/review_list.html
+++ b/opentech/apply/review/templates/review/review_list.html
@@ -23,7 +23,11 @@
<tr class="reviews-list__tr">
<th class="reviews-list__th">{{ answers.question }}</th>
{% for answer in answers.answers %}
- <td class="reviews-list__td">{{ answer|bleach }}</td>
+ {% ifequal answers.question "Opinions" %}
+ <td class="reviews-list__td">{{ answer }}</td>
+ {% else %}
+ <td class="reviews-list__td">{{ answer|bleach }}</td>
+ {% endifequal %}
{% endfor %}
</tr>
{% endfor %}
diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py
index bcfc7155b..6ba083979 100644
--- a/opentech/apply/review/views.py
+++ b/opentech/apply/review/views.py
@@ -4,6 +4,7 @@ from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
+from django.template.loader import get_template
from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
from django.views.generic import CreateView, ListView, DetailView
@@ -253,10 +254,12 @@ 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))
+ if review.opinions:
+ opinions_template = get_template('review/includes/review_opinions_list.html')
+ opinions_html = opinions_template.render({'opinions': review.opinions.all()})
+ review_data['opinions']['answers'].append(opinions_html)
+ else:
+ review_data['opinions']['answers'].append("")
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