From a48c55cd0948dcad9d2a5a23c34ccb2946ac1e68 Mon Sep 17 00:00:00 2001 From: Todd Dembrey <todd.dembrey@torchbox.com> Date: Thu, 7 Mar 2019 09:09:13 +0000 Subject: [PATCH] Add partner to the traditional review block --- .../templates/funds/includes/review_sidebar.html | 13 +++++++++++++ opentech/apply/review/views.py | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/opentech/apply/funds/templates/funds/includes/review_sidebar.html b/opentech/apply/funds/templates/funds/includes/review_sidebar.html index a0fe991e5..5db34c90f 100644 --- a/opentech/apply/funds/templates/funds/includes/review_sidebar.html +++ b/opentech/apply/funds/templates/funds/includes/review_sidebar.html @@ -28,6 +28,19 @@ {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer missing=True %} {% endfor %} + {% if reviews_block.partner_reviewed or reviews_block.partner_not_reviewed %} + <hr class="reviews-sidebar__split"> + + {% for review_data in reviews_block.partner_reviewed %} + {% include 'funds/includes/review_sidebar_item.html' with review=review_data.review reviewer=review_data.reviewer opinions=review_data.opinions %} + {% endfor %} + + {% for review_data in reviews_block.partner_not_reviewed %} + {% include 'funds/includes/review_sidebar_item.html' with reviewer=review_data.reviewer missing=True %} + {% endfor %} + + {% endif %} + {% if object.stage.has_external_review %} {% if reviews_block.external_reviewed or reviews_block.external_not_reviewed %} <hr class="reviews-sidebar__split"> diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py index 03da640b2..b73244785 100644 --- a/opentech/apply/review/views.py +++ b/opentech/apply/review/views.py @@ -52,6 +52,11 @@ class ReviewContextMixin: key = 'staff_reviewed' elif review not in opinion_authors: key = 'staff_not_reviewed' + elif reviewer.is_partner: + if review: + key = 'partner_reviewed' + elif review not in opinion_authors: + key = 'partner_not_reviewed' else: if review: key = 'external_reviewed' -- GitLab