Merge remote-tracking branch 'origin' into ics

# Conflicts:
#	pgcommitfest/commitfest/templates/all_commitfests.html
#	pgcommitfest/commitfest/views.py

Author: JelteF

pgcommitfest/commitfest/templates/all_commitfests.html

@@ -3,7 +3,8 @@
  <p><a href="/commitfests.ics">Subscribe to Commitfest dates (ICS)</a></p>
  <ul>
   {%for c in commitfests%}
-   <li><a href="/{{c.id}}/">{{c}}</a> ({{c.statusstring}}{%if c.startdate%} - {{c.periodstring}}{%endif%})</li>
+   <li><a href="/{{c.id}}/">{{c}}</a> ({{c.statusstring}} - {{c.periodstring}})</li>
   {%endfor%}
  </ul>
+ <br/>
 {%endblock%}

pgcommitfest/commitfest/templates/archive.html

@@ -46,12 +46,12 @@
          <a class="nav-link{% if cf and cf.is_open_draft %} active{% endif %}" href="/draft/">Draft CF</a>
         </li>
         <li class="nav-item dropdown">
-         <a class="nav-link dropdown-toggle{% if '/activity/' in request.path or '/commitfest_history/' in request.path %} active{% endif %}" href="#" id="moreDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+         <a class="nav-link dropdown-toggle{% if '/activity/' in request.path or '/archive/' in request.path %} active{% endif %}" href="#" id="moreDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
           More
          </a>
          <ul class="dropdown-menu" aria-labelledby="moreDropdown">
           <li><a class="dropdown-item" href="/activity/">Activity Log</a></li>
-          <li><a class="dropdown-item" href="/commitfest_history/">All Commitfests</a></li>
+          <li><a class="dropdown-item" href="/archive/">All Commitfests</a></li>
          </ul>
         </li>
         <li class="nav-item">

pgcommitfest/commitfest/templates/base.html

@@ -9,6 +9,7 @@
     HttpRequest,
     HttpResponse,
     HttpResponseForbidden,
+    HttpResponsePermanentRedirect,
     HttpResponseRedirect,
 )
 from django.shortcuts import get_object_or_404, render
@@ -194,12 +195,19 @@ def me_legacy_redirect(request):
     return HttpResponseRedirect("/#dashboard")
 
 
-def commitfest_history(request):
+def commitfest_history_legacy_redirect(request):
+    # For a while the list of all commitfests lived here, next to an unsorted
+    # duplicate at /archive/. The two were merged under /archive/ since that's
+    # the shorter URL, but links to this one should keep working.
+    return HttpResponsePermanentRedirect("/archive/")
+
+
+def archive(request):
     cfs = list(CommitFest.objects.order_by("-enddate"))
 
     return render(
         request,
-        "all_commitfests.html",
+        "archive.html",
         {
             "commitfests": cfs,
             "title": "Commitfest history",
@@ -221,21 +229,6 @@ def help(request):
     )
 
 
-def archive(request):
-    commitfests = list(CommitFest.objects.all())
-
-    return render(
-        request,
-        "archive.html",
-        {
-            "commitfests": commitfests,
-            "title": "Commitfests",
-            "header_activity": "Activity log",
-            "header_activity_link": "activity/",
-        },
-    )
-
-
 def commitfests_ics(_: HttpRequest) -> HttpResponse:
     """
     Calendar feed of all non-draft commitfests in iCalendar format (RFC 5545).

pgcommitfest/commitfest/views.py

@@ -21,7 +21,7 @@
     re_path(r"^api/v1/commitfests/(\d+)/patches$", apiv1.commitfest_patches),
     re_path(r"^api/v1/patches/(\d+)/threads$", apiv1.patch_threads),
     re_path(r"^help/$", views.help),
-    re_path(r"^commitfest_history/$", views.commitfest_history),
+    re_path(r"^commitfest_history/$", views.commitfest_history_legacy_redirect),
     re_path(r"^me/$", views.me_legacy_redirect),
     re_path(r"^archive/$", views.archive),
     re_path(r"^commitfests\.ics$", views.commitfests_ics),