distinctify people

district/blocks.py

@@ -153,6 +153,8 @@ class OctopusMixin(blocks.StructBlock):
                 originating_groups__name=value["group_shortcut"]
             )
             .order_by("person__order", "title")
+            # Hacky, but should work all of the time with our current members.
+            .distinct("person__order", "title")
             .all()
         )
 
@@ -217,6 +219,8 @@ class OctopusTeamBlock(OctopusMixin):
         context["person_list"] = (
             DistrictOctopusPersonPage.objects.filter(filter)
             .order_by("person__order", "title")
+            # Hacky, but should work all of the time with our current members.
+            .distinct("person__order", "title")
             .all()
         )
 

district/templatetags/district_people_filters.py

@@ -24,7 +24,8 @@ def get_block_octopus_person_list(block):
     return (
         DistrictOctopusPersonPage.objects.filter(filter)
         .order_by("person__order", "title")
-        .distinct()
+        # Hacky, but should work all of the time with our current members.
+        .distinct("person__order", "title")
         .live()
         .all()
     )