Skip to content
Snippets Groups Projects
Commit cc489a43 authored by Todd Dembrey's avatar Todd Dembrey Committed by Fredrik Jonsson
Browse files

Add the reviewer role to the review list

parent 6ad086d4
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
<tr class="reviews-list__tr"> <tr class="reviews-list__tr">
<th class="reviews-list__th">{{ answers.question }}</th> <th class="reviews-list__th">{{ answers.question }}</th>
{% for answer in answers.answers %} {% 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> <td class="reviews-list__td">{{ answer }}</td>
{% else %} {% else %}
<td class="reviews-list__td">{{ answer|bleach }}</td> <td class="reviews-list__td">{{ answer|bleach }}</td>
......
...@@ -18,6 +18,7 @@ from opentech.apply.stream_forms.models import BaseStreamForm ...@@ -18,6 +18,7 @@ from opentech.apply.stream_forms.models import BaseStreamForm
from opentech.apply.users.decorators import staff_required from opentech.apply.users.decorators import staff_required
from opentech.apply.users.groups import REVIEWER_GROUP_NAME from opentech.apply.users.groups import REVIEWER_GROUP_NAME
from opentech.apply.utils.views import CreateOrUpdateView from opentech.apply.utils.views import CreateOrUpdateView
from opentech.apply.utils.image import generate_image_tag
from .models import Review from .models import Review
from .options import DISAGREE from .options import DISAGREE
...@@ -268,7 +269,12 @@ class ReviewListView(ListView): ...@@ -268,7 +269,12 @@ class ReviewListView(ListView):
responses = self.object_list.count() responses = self.object_list.count()
for i, review in enumerate(self.object_list): 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_template = get_template('review/includes/review_opinions_list.html')
opinions_html = opinions_template.render({'opinions': review.opinions.select_related('author').all()}) opinions_html = opinions_template.render({'opinions': review.opinions.select_related('author').all()})
review_data['opinions']['answers'].append(opinions_html) review_data['opinions']['answers'].append(opinions_html)
......
...@@ -21,6 +21,17 @@ ...@@ -21,6 +21,17 @@
max-width: 340px; max-width: 340px;
min-width: 240px; min-width: 240px;
padding: 20px; padding: 20px;
&--author {
> div {
display: flex;
align-items: center;
img {
margin-left: 7px;
}
}
}
} }
&__th, &__th,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment