Add some prefetching for organizations

scipost_django/organizations/models.py

@@ -322,7 +322,13 @@ class Organization(models.Model):
             rep[str(year)] = {}
             year_expenditures = 0
             rep[str(year)]["expenditures"] = {}
-            pfy = self.pubfractions.filter(publication__publication_date__year=year)
+            pfy = self.pubfractions.filter(
+                publication__publication_date__year=year
+            ).prefetch_related(
+                "publication__in_journal",
+                "publication__in_issue__in_journal",
+                "publication__in_issue__in_volume__in_journal",
+            )
             contribution = self.total_subsidies_in_year(year)
             rep[str(year)]["contribution"] = contribution
             journal_labels = set(

scipost_django/organizations/templates/organizations/_organization_detail_contents.html

@@ -51,6 +51,7 @@
 	  {% endfor %}
 	  <img class="rounded" style="max-height: 8rem; max-width: 16rem;"
 	       src="{{ org.logo.url }}" alt="{{ org.name }} logo">
+	</picture>
       </li>
       {% elif org.logo %}
       <img class="d-flex me-3 {{ org.css_class }}" src="{{ org.logo.url }}" alt="image"/>

scipost_django/organizations/views.py

@@ -166,7 +166,7 @@ class OrganizationListView(PaginationMixin, ListView):
             )
         if ordering == "desc":
             qs = qs.reverse()
-        return qs
+        return qs.select_related('logos')
 
 
 def get_organization_detail(request):
@@ -194,7 +194,13 @@ class OrganizationDetailView(DetailView):
         queryset = super().get_queryset()
         if not self.request.user.has_perm("scipost.can_manage_organizations"):
             queryset = queryset.exclude(orgtype=ORGTYPE_PRIVATE_BENEFACTOR)
-        return queryset
+        return queryset.prefetch_related(
+            "children",
+            "subsidy_set",
+            "contactrole_set",
+            "organizationevent_set",
+            "pubfractions",
+        )
 
 
 class OrganizationEventCreateView(PermissionsMixin, CreateView):