Use metadata if it exists

DemocracyClub · Apr 18, 2023 · 3947a72 · 3947a72
1 parent bb76a87
commit 3947a72
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/wcivf/apps/elections/templates/elections/includes/_cancelled_election.html b/wcivf/apps/elections/templates/elections/includes/_cancelled_election.html
@@ -3,7 +3,7 @@
 {% load static %}
 {% load i18n %}
 
-{% if not object.contested %}
+{% if not object.contested and not object.metadata.cancelled_election %}
     {% comment %} Case 1: Election cancelled, uncontested, number of candidates equal seats, no metadata{% endcomment %}
     {% if object.winner_count == object.people.count %}
         <h4>{% trans "Uncontested Election" %}</h4>
@@ -49,8 +49,14 @@ <h4>{% trans "Uncontested and Rescheduled Election" %}</h4>
     {% endif %}
     {% comment %} Case 4: Contested but cancelled for other reasons {% endcomment %}
 {% else %}
-    <h4>{% trans "Cancelled Election" %}</h4>
-    <p>{% trans "This election was cancelled." %}</p>
+    {% if object.metadata.cancelled_election %}
+        <h4>{{ object.metadata.cancelled_election.title }}</h4>
+        <p>{{ object.metadata.cancelled_election.detail }}</p>
+    {% else %}
+        <h4>{% trans "Cancelled Election" %}</h4>
+        <p>{% trans "This election was cancelled." %}</p>
+    {% endif %}
+
 {% endif %}
 
 <p>
@@ -73,7 +79,10 @@ <h4>{% trans "Cancelled Election" %}</h4>
 but rather provide extra information that is not already present in the logic
 {% endcomment %}
 <p>
+    {% if object.metadata.cancelled_election.title and object.metadata.cancelled_election.title != object.metadata.cancelled_election.description %}
+        {{ object.metadata.cancelled_election.title }}
+    {% endif %}
     {% if object.metadata.cancelled_election.detail %}
         {{ object.metadata.cancelled_election.detail }}
     {% endif %}
-</p>
+</p>