From cc489a43ae92543232320b104bed0bdf694ab332 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Fri, 24 May 2019 11:02:36 +0100
Subject: [PATCH] Add the reviewer role to the review list
---
.../apply/review/templates/review/review_list.html | 4 +++-
opentech/apply/review/views.py | 8 +++++++-
.../src/sass/apply/components/_reviews-list.scss | 11 +++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/opentech/apply/review/templates/review/review_list.html b/opentech/apply/review/templates/review/review_list.html
index 7487a763f..8576b3f56 100644
--- a/opentech/apply/review/templates/review/review_list.html
+++ b/opentech/apply/review/templates/review/review_list.html
@@ -23,7 +23,9 @@
<tr class="reviews-list__tr">
<th class="reviews-list__th">{{ answers.question }}</th>
{% for answer in answers.answers %}
- {% if answers.question == "Opinions" %}
+ {% if forloop.parentloop.first %}
+ <td class="reviews-list__td reviews-list__td--author">{{ answer|safe }}</td>
+ {% elif answers.question == "Opinions"%}
<td class="reviews-list__td">{{ answer }}</td>
{% else %}
<td class="reviews-list__td">{{ answer|bleach }}</td>
diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py
index f428bedc6..01fd0bb33 100644
--- a/opentech/apply/review/views.py
+++ b/opentech/apply/review/views.py
@@ -18,6 +18,7 @@ from opentech.apply.stream_forms.models import BaseStreamForm
from opentech.apply.users.decorators import staff_required
from opentech.apply.users.groups import REVIEWER_GROUP_NAME
from opentech.apply.utils.views import CreateOrUpdateView
+from opentech.apply.utils.image import generate_image_tag
from .models import Review
from .options import DISAGREE
@@ -268,7 +269,12 @@ class ReviewListView(ListView):
responses = self.object_list.count()
for i, review in enumerate(self.object_list):
- review_data['title']['answers'].append('<a href="{}">{}</a>'.format(review.get_absolute_url(), review.author))
+ author = '<a href="{}"><span>{}</span></a>'.format(review.get_absolute_url(), review.author)
+ if review.author.role:
+ author += generate_image_tag(review.author.role.icon, '12x12')
+ author = f'<div>{author}</div>'
+
+ review_data['title']['answers'].append(author)
opinions_template = get_template('review/includes/review_opinions_list.html')
opinions_html = opinions_template.render({'opinions': review.opinions.select_related('author').all()})
review_data['opinions']['answers'].append(opinions_html)
diff --git a/opentech/static_src/src/sass/apply/components/_reviews-list.scss b/opentech/static_src/src/sass/apply/components/_reviews-list.scss
index 3d4e06634..e3b41fe54 100644
--- a/opentech/static_src/src/sass/apply/components/_reviews-list.scss
+++ b/opentech/static_src/src/sass/apply/components/_reviews-list.scss
@@ -21,6 +21,17 @@
max-width: 340px;
min-width: 240px;
padding: 20px;
+
+ &--author {
+ > div {
+ display: flex;
+ align-items: center;
+
+ img {
+ margin-left: 7px;
+ }
+ }
+ }
}
&__th,
--
GitLab