#959 check for no top reviews for two types of reviews

opentech/apply/funds/templates/funds/includes/review_table.html

@@ -14,8 +14,6 @@
             {% include 'funds/includes/review_table_row.html' with reviewer=review_data.reviewer role=review_data.role missing=True %}
         {% endfor %}
 
-    {% else %}
-        <tr><td colspan="4" class="reviews-sidebar__no-reviews">No reviews yet</td></tr>
     {% endif %}
 
     {% if reviews_block.staff_reviewed or reviews_block.staff_not_reviewed %}
@@ -32,7 +30,9 @@
             {% include 'funds/includes/review_table_row.html' with reviewer=review_data.reviewer missing=True %}
         {% endfor %}
 
-    {% else %}
+    {% endif %}
+
+    {% if no_top_reviews %}
         <tr><td colspan="4" class="reviews-sidebar__no-reviews">No reviews yet</td></tr>
     {% endif %}
 

opentech/apply/review/views.py

@@ -27,16 +27,19 @@ class ReviewContextMixin:
         reviews = self.object.reviews.all().select_related('author')
 
         reviews_block = defaultdict(list)
+        no_top_reviews = True
         for assigned_reviewer in assigned:
             reviewer = assigned_reviewer.reviewer
             role = assigned_reviewer.role
             review = reviews.filter(author=reviewer).first()
             if role:
+                no_top_reviews = False
                 if review:
                     key = 'role_reviewed'
                 else:
                     key = 'role_not_reviewed'
             elif reviewer.is_apply_staff:
+                no_top_reviews = False
                 if review:
                     key = 'staff_reviewed'
                 else:
@@ -55,6 +58,7 @@ class ReviewContextMixin:
 
         return super().get_context_data(
             reviews_block=reviews_block,
+            no_top_reviews=no_top_reviews,
             **kwargs,
         )