Fix date of minutes entry having a wrong URL if minute is a draft

myhpi/core/models.py

@@ -6,6 +6,7 @@
 from django.db import models
 from django.db.models import BooleanField, CharField, DateField, ForeignKey, Model, Q
 from django.http import HttpResponseRedirect
+from django.urls import reverse
 from django_select2 import forms as s2forms
 from modelcluster.contrib.taggit import ClusterTaggableManager
 from modelcluster.fields import ParentalKey, ParentalManyToManyField
@@ -228,6 +229,14 @@ class Minutes(BasePage):
 
     base_form_class = MinutesForm
 
+    # this function also fetches the correct draft url if the minute is still a draft
+    def get_valid_url(self):
+        return (
+            self.url
+            if self.live
+            else reverse("wagtailadmin_pages:view_draft", kwargs={"page_id": self.id})
+        )
+
 
 class RootPage(InformationPage):
     template = "core/information_page.html"

myhpi/core/templates/core/minutes_list.html

@@ -9,7 +9,7 @@ <h3 id="year{{ year }}">{{ year }}</h3>
         <table class="table table-striped">
         {% for minute in minutes %}
             <tr>
-                <td><a href="{% pageurl minute %}">{{ minute.date|date:"d.m.Y" }}</a></td>
+                <td><a href="{{ minute.get_valid_url }}">{{ minute.date|date:"d.m.Y" }}</a></td>
                 <td>
                     {% if not minute.live %}
                         <span title={% translate "Draft" %} aria-hidden="true">⚠️</span>
@@ -18,7 +18,7 @@ <h3 id="year{{ year }}">{{ year }}</h3>
                 <td>
                     {% include "core/label.html" with minutes=minute %}
                 </td>
-                <td><a href="{% if minute.live %}{% pageurl minute %}{% else %}{% url "wagtailadmin_pages:view_draft" minute.id %}{% endif %}">{{ minute.title }}</a></td>
+                <td><a href="{{ minute.get_valid_url }}">{{ minute.title }}</a></td>
                 <td>
                     {% if minute.attachments.count > 0 %}
                         <span class="text-gray" data-toggle="tooltip" data-placement="left" data-container="body" title="{{ minute.attachments.all|join:', ' }}">