Merge pull request #1292 from Metro-Records/feature/1273-agenda

Add person titles to wagtail + handle events with unpublished agendas

Author: antidipyramid

lametro/migrations/0027_boardmemberdetails_title.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.25 on 2026-02-19 20:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("lametro", "0026_fiscalyearcalendar_cal_type"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="boardmemberdetails",
+            name="title",
+            field=models.CharField(
+                blank=True,
+                help_text="The position that will show up on this person's detail page e.g. Board Member",
+                max_length=64,
+                null=True,
+            ),
+        ),
+    ]

lametro/models/cms.py

@@ -78,6 +78,12 @@ class Meta:
         max_length=256, blank=True, null=True, default="Metro"
     )
     bio = RichTextField(blank=True, null=True)
+    title = models.CharField(
+        max_length=64,
+        blank=True,
+        null=True,
+        help_text="The position that will show up on this person's detail page e.g. Board Member",
+    )
     _revisions = GenericRelation(
         "wagtailcore.Revision", related_query_name="member_details"
     )

lametro/models/legislative.py

@@ -389,6 +389,22 @@ def latest_council_membership(self):
             return primary_memberships.order_by("-end_date").first()
         return None
 
+    @property
+    def latest_committee_membership(self):
+        return (
+            self.memberships.exclude(organization__name=settings.OCD_CITY_COUNCIL_NAME)
+            .order_by("-end_date")
+            .first()
+        )
+
+    @property
+    def current_committee_seat(self):
+        m = self.latest_committee_membership
+        if m and m.end_date_dt > timezone.now():
+            return m
+
+        return None
+
     @property
     def current_district(self):
         m = self.latest_council_membership

lametro/templates/committee.html

@@ -85,11 +85,7 @@ <h2 class="d-inline h4">
                         </div>
                     </td>
                     <td>
-                        {% if membership.person.latest_council_membership %}
-                            <a href="{% url 'lametro:person' membership.person.slug %}">{{ membership.person.name }}</a>
-                        {% else %}
-                            {{ membership.person.name }}
-                        {% endif %}
+                        <a href="{% url 'lametro:person' membership.person.slug %}">{{ membership.person.name }}</a>
                     </td>
                     <td>
                         {{ membership.extras | clean_membership_extras }} {{ membership.person.latest_council_membership.post.label | format_label }}

lametro/templates/event/event.html

@@ -139,7 +139,7 @@ <h2 class="h4">Minutes</h2>
                     {% endif %}
                 </div>
                 <div class="col-lg-5 mt-4 mt-lg-0">
-                    {% if related_board_reports %}
+                    {% if related_board_reports and agenda %}
                         {% include 'event/_related_bills.html' %}
                     {% endif %}
                 </div>

lametro/templates/person/person.html

@@ -16,9 +16,13 @@
             <h1 class="d-inline-block me-1">{{ person.name }}</h1>
             <div class="d-inline-block">
                 <div class="text-secondary d-inline-block fw-normal h4">
-                    {% if person.current_council_seat %}
+                    {% if person.details.title %}
+                        {{ person.details.title }}
+                    {% elif person.current_council_seat %}
                         {{ person.current_council_seat.role }}
-                    {% elif person.latest_council_membership.role %}
+                    {% elif person.current_committee_seat %}
+                        Committee Member
+                    {% elif person.latest_council_membership.role and not person.current_committee_seat %}
                         Former {{ person.latest_council_membership.role }}
                     {% endif %}
                 </div>

lametro/wagtail_hooks.py

@@ -193,6 +193,7 @@ def permission_policy(self):
                     "on the live page.</p>"
                 )
             ),
+            FieldPanel("title"),
             MultiFieldPanel(
                 [
                     FieldPanel("headshot", heading="Image"),