From 98b946b7f1da3384f5075e8ab0d4525e22b7eadf Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 6 Mar 2019 10:41:29 +0100
Subject: [PATCH] List partner reviews in reviews block.
---
.../apply/funds/templates/funds/includes/review_table.html | 4 +++-
opentech/apply/review/models.py | 3 +++
opentech/apply/review/views.py | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/opentech/apply/funds/templates/funds/includes/review_table.html b/opentech/apply/funds/templates/funds/includes/review_table.html
index cacd82ba3..4120f8b0f 100644
--- a/opentech/apply/funds/templates/funds/includes/review_table.html
+++ b/opentech/apply/funds/templates/funds/includes/review_table.html
@@ -20,8 +20,10 @@
{% if object.stage.has_external_review %}
<tr class="tr tr--subchild"><td colspan="4"><hr></td></tr>
- {% if reviewer_reviews or object.reviewers_not_reviewed %}
+ {% if reviewer_reviews or partner_reviews or object.reviewers_not_reviewed %}
{% include 'funds/includes/review_table_row.html' with reviews=reviewer_reviews %}
+ <tr class="tr tr--subchild"><td colspan="4"><hr></td></tr>
+ {% include 'funds/includes/review_table_row.html' with reviews=partner_reviews %}
{% if object.reviewers_not_reviewed %}
{% include 'funds/includes/review_table_row.html' with reviews=object.reviewers_not_reviewed missing=True class="hidden" %}
<tr><td colspan="4"><a class="link link--bold link--underlined js-toggle-reviewers" href="#">All Assigned Advisors</a></td></tr>
diff --git a/opentech/apply/review/models.py b/opentech/apply/review/models.py
index 75cfa7c1f..cad1a3a1a 100644
--- a/opentech/apply/review/models.py
+++ b/opentech/apply/review/models.py
@@ -78,6 +78,9 @@ class ReviewQuerySet(models.QuerySet):
def by_reviewers(self):
return self.submitted().filter(author__in=User.objects.reviewers())
+ def by_partners(self):
+ return self.submitted().filter(author__in=User.objects.partners())
+
def staff_score(self):
return self.by_staff().score()
diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py
index 0a075b5c1..2ef6119c3 100644
--- a/opentech/apply/review/views.py
+++ b/opentech/apply/review/views.py
@@ -23,9 +23,11 @@ class ReviewContextMixin:
def get_context_data(self, **kwargs):
staff_reviews = self.object.reviews.by_staff().select_related('author')
reviewer_reviews = self.object.reviews.by_reviewers().exclude(id__in=staff_reviews).select_related('author')
+ partner_reviews = self.object.reviews.by_partners().exclude(id__in=staff_reviews).select_related('author')
return super().get_context_data(
staff_reviews=staff_reviews,
reviewer_reviews=reviewer_reviews,
+ partner_reviews=partner_reviews,
**kwargs,
)
--
GitLab