Enhance article templates and optimize database queries for tagged pages

magazine/templates/magazine/magazine_article_summary.html

@@ -8,18 +8,20 @@ <h3 class="card-title">
             </a>
         </h3>
 
-        {% if article.authors.count %}
-            <div class="mb-2">
-                <span class="font-medium">Author(s):</span>
-                {% for author in article.authors.all %}
-                    {% if author.author.live %}
-                        <a href="{% pageurl author.author %}">{{ author.author }}</a>{% if not forloop.last %},{% endif %}
-                    {% else %}
-                        {{ author.author }}{% if not forloop.last %},{% endif %}
-                    {% endif %}
-                {% endfor %}
-            </div>
-        {% endif %}
+        {% with author_links=article.authors.all %}
+            {% if author_links %}
+                <div class="mb-2">
+                    <span class="font-medium">Author(s):</span>
+                    {% for author in author_links %}
+                        {% if author.author.live %}
+                            <a href="{% pageurl author.author %}">{{ author.author }}</a>{% if not forloop.last %},{% endif %}
+                        {% else %}
+                            {{ author.author }}{% if not forloop.last %},{% endif %}
+                        {% endif %}
+                    {% endfor %}
+                </div>
+            {% endif %}
+        {% endwith %}
 
         <div class="prose">
             {{ article.teaser|richtext }}

magazine/templates/search/magazine_article.html

@@ -0,0 +1 @@
+{% include "magazine/magazine_article_summary.html" with article=entity.specific %}

magazine/templates/search/magazine_issue.html

@@ -0,0 +1,11 @@
+{% load wagtailcore_tags %}
+<article class="card bg-base-100 shadow-sm hover:shadow-md transition-shadow mb-4">
+  <div class="card-body">
+    <h3 class="card-title">
+      <a href="{% pageurl entity %}">{{ entity.title }}</a>
+    </h3>
+    {% if entity.specific.publication_date %}
+      <p class="text-sm text-base-content/70">Published {{ entity.specific.publication_date|date:"F Y" }}</p>
+    {% endif %}
+  </div>
+</article>

tags/views.py

@@ -25,15 +25,31 @@ def get_queryset(self):
         # Get all the pages tagged with the given tag
         filter_condition = Q(tags__slug__in=[tag])
 
-        library_items = LibraryItem.objects.filter(filter_condition).order_by("title")
+        library_items = (
+            LibraryItem.objects.filter(filter_condition)
+            .select_related("content_type")
+            .prefetch_related("authors__author")
+            .order_by("title")
+        )
 
-        magazine_articles = MagazineArticle.objects.filter(filter_condition).order_by(
-            "title",
+        magazine_articles = (
+            MagazineArticle.objects.filter(filter_condition)
+            .select_related("content_type")
+            .prefetch_related("authors__author", "issue")
+            .order_by("title")
         )
 
-        news_items = NewsItem.objects.filter(filter_condition).order_by("title")
+        news_items = (
+            NewsItem.objects.filter(filter_condition)
+            .select_related("content_type")
+            .order_by("title")
+        )
 
-        pages = WfPage.objects.filter(filter_condition).order_by("title")
+        pages = (
+            WfPage.objects.filter(filter_condition)
+            .select_related("content_type")
+            .order_by("title")
+        )
 
         combined_queryset_list = list(
             chain(