Merge pull request #560 from OpenUpSA/fix/old-committee-meetings

Fallbacks for old event committee meetings without linked committee

pmg/templates/committee_layout.html

@@ -1,16 +1,25 @@
 {% extends "base.html" %}
 
-{% block title %}{{ committee.name }} | PMG{% endblock %}
+{% block title %}
+  {% if committee %}
+    {{ committee.name }} | 
+  {% endif %}
+  PMG
+{% endblock %}
 
 {% block breadcrumb %}
 <ol class="breadcrumb">
   {% block committee_breadcrumb %}
   {% if not from_page %}
   <li><a href="{{ url_for('committees') }}">Committees</a></li>
-  <li><a href="/committees#{% if committee.house.sphere == 'provincial' %}prov{% elif committee.ad_hoc %}adhoc{% else %}{{ committee.house.short_name }}{% endif %}">{{ committee.house.name }}</a></li>
+    {% if committee %}
+    <li><a href="/committees#{% if committee.house.sphere == 'provincial' %}prov{% elif committee.ad_hoc %}adhoc{% else %}{{ committee.house.short_name }}{% endif %}">{{ committee.house.name }}</a></li>
+    {% endif %}
   {% else %}
   <li><a href="{{ url_for('provincial_legislatures_list') }}">Provincial Legislatures</a></li>
-  <li><a href="{{ url_for('provincial_legislatures_detail', slug=from_page) }}">{{ committee.house.name }}</a></li>
+    {% if committee %}
+    <li><a href="{{ url_for('provincial_legislatures_detail', slug=from_page) }}">{{ committee.house.name }}</a></li>
+    {% endif %}
   <li><a href="{{ url_for('provincial_committees', slug=from_page) }}">Committees</a></li>
   {% endif %}
   {% endblock %}
@@ -22,6 +31,7 @@
     <div class="col-sm-8">
       <header class="committee-header">
         {% block committee_title %}
+          {% if committee %}
           <div class="row">
               {% if not committee.premium %}
               <h1 class="col-xs-12 committee-name">{{ committee.name }}</h1>
@@ -36,6 +46,7 @@ <h4 class="light-red">{{ committee.house.name }}</h4>
           <h4 class="light-red">{{ committee.house.name }} Committee</h4>
           {% endif %}
           <div class="{% if not committee.about %}no-about{% endif %}">{% include '_social_sharing.html' %}</div>
+          {% endif %}
         {% endblock %}
       </header>
 

pmg/templates/committee_meeting.html

@@ -5,7 +5,9 @@
 
 {% block committee_breadcrumb %}
   {{ super() }}
-  <li><a href="{{ url_for('committee_detail', committee_id=committee.id) }}">{{ committee.name }}</a></li>
+  {% if committee %}
+    <li><a href="{{ url_for('committee_detail', committee_id=committee.id) }}">{{ committee.name }}</a></li>
+    {% endif %}
 {% endblock %}
 
 {% block javascript %}
@@ -20,7 +22,9 @@ <h1>{{ event.title }}</h1>
       {% if event.premium_but_free %}
         <div class="premium-but-free"><i class="fa fa-fw fa-unlock-alt" aria-hidden="true"></i> This premium content has been made freely available</div>
       {% endif %}
+      {% if committee %}
       <h4><a href="{{ url_for('committee_detail', committee_id=committee.id) }}">{{ committee.name }}</a></h4>
+      {% endif %}
       {% if event.date %}
         <h5 class="date">{{ event.date | pretty_date("long") }}</h5>
       {% endif %}

pmg/views.py

@@ -799,10 +799,14 @@ def committee_meeting(event_id):
     ) + sorted(
         [a for a in attendance if not a["chairperson"]], key=sorter
     )  # noqa
+    if event["committee"]:
+        event_committee_name = event["committee"]["name"]
+    else:
+        event_committee_name = "[UNKNOWN COMMITTEE]"
     if event["chairperson"]:
         social_summary = (
             "A meeting of the "
-            + event["committee"]["name"]
+            + event_committee_name
             + " committee held on "
             + pretty_date(event["date"], "long")
             + ", lead by "
@@ -811,7 +815,7 @@ def committee_meeting(event_id):
     else:
         social_summary = (
             "A meeting of the "
-            + event["committee"]["name"]
+            + event_committee_name
             + " committee held on "
             + pretty_date(event["date"], "long")
             + "."