fix: Show also diamond and platinium member in theses pages

Author: antoinehashbang

djangoproject/templates/aggregator/index.html

@@ -99,5 +99,5 @@ <h2 class="bullet-icon"><i class="icon icon-rss blue"></i> {{ feedtype.name }}</
 {% endblock %}
 
 {% block content-related-extra %}
-  {% gold_corporate_members %}
+  {% top_and_gold_corporate_members %}
 {% endblock %}

djangoproject/templates/flatpages/foundation.html

@@ -10,5 +10,5 @@ <h1>{{ flatpage.title }}</h1>
 {% endblock %}
 
 {% block content-related-extra %}
-    {% gold_corporate_members %}
+    {% top_and_gold_corporate_members %}
 {% endblock %}

djangoproject/templates/fundraising/includes/gold_corporate_members.html renamed to djangoproject/templates/fundraising/includes/top_and_gold_corporate_members.html

@@ -1,6 +1,6 @@
 {% if members %}
   <div class="corporate-members">
-    <h3>Gold Members</h3>
+    <h3>Diamond, Platinum and Gold Members</h3>
     {% for obj in members %}
       <div class="clearfix">
         <div class="member-logo">

fundraising/templatetags/fundraising_extras.py

@@ -120,8 +120,8 @@ def top_corporate_members():
     return {"members": members["diamond"] + members["platinum"]}
 
 
-@register.inclusion_tag("fundraising/includes/gold_corporate_members.html")
-def gold_corporate_members():
+@register.inclusion_tag("fundraising/includes/top_and_gold_corporate_members.html")
+def top_and_gold_corporate_members():
     members = CorporateMember.objects.by_membership_level()
 
-    return {"members": members["gold"]}
+    return {"members": members["diamond"] + members["platinum"] + members["gold"]}

fundraising/tests/test_templatetags.py

@@ -17,7 +17,7 @@
 from ..templatetags.fundraising_extras import (
     display_django_heroes,
     donation_form_with_heart,
-    gold_corporate_members,
+    top_and_gold_corporate_members,
     top_corporate_members,
 )
 
@@ -170,12 +170,12 @@ def test_with_diamond_members_and_platinum_members(self):
         self.assertEqual(members, expected)
 
 
-class TestGoldCorporateMembers(TestCase):
+class TestTopAndGoldCorporateMembers(TestCase):
     past_date = date(2000, 1, 1)
     future_date = date(3000, 1, 1)
 
     def test_with_no_gold_members(self):
-        members = gold_corporate_members()["members"]
+        members = top_and_gold_corporate_members()["members"]
         self.assertEqual(members, [])
 
     def test_with_gold_members(self):
@@ -187,22 +187,26 @@ def test_with_gold_members(self):
         member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
         member_3.invoice_set.create(amount=2, expiration_date=self.future_date)
 
-        members = gold_corporate_members()["members"]
+        members = top_and_gold_corporate_members()["members"]
 
         self.assertEqual(members, [member_2, member_1, member_3])
 
     def test_with_gold_members_and_other_members(self):
         member_1 = CorporateMember.objects.create(membership_level=3)
         member_2 = CorporateMember.objects.create(membership_level=3)
         member_3 = CorporateMember.objects.create(membership_level=4)
+        member_4 = CorporateMember.objects.create(membership_level=5)
+        member_5 = CorporateMember.objects.create(membership_level=2)
 
         member_1.invoice_set.create(amount=4, expiration_date=self.future_date)
         member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
         member_3.invoice_set.create(amount=2, expiration_date=self.future_date)
+        member_4.invoice_set.create(amount=2, expiration_date=self.future_date)
+        member_5.invoice_set.create(amount=2, expiration_date=self.future_date)
 
-        members = gold_corporate_members()["members"]
-        self.assertEqual(members, [member_2, member_1])
-        self.assertNotIn(member_3, members)
+        members = top_and_gold_corporate_members()["members"]
+        self.assertEqual(members, [member_4, member_3, member_2, member_1])
+        self.assertNotIn(member_5, members)
 
     def test_with_gold_members_and_expired_invoice(self):
         member_1 = CorporateMember.objects.create(membership_level=3)
@@ -213,6 +217,6 @@ def test_with_gold_members_and_expired_invoice(self):
         member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
         member_3.invoice_set.create(amount=2, expiration_date=self.past_date)
 
-        members = gold_corporate_members()["members"]
+        members = top_and_gold_corporate_members()["members"]
         self.assertEqual(members, [member_2, member_1])
         self.assertNotIn(member_3, members)