From 68909450cfb8a212d6deaed59db265acdcbe6aed Mon Sep 17 00:00:00 2001
From: Michael Bauer <michael-bauer@posteo.de>
Date: Thu, 24 Oct 2024 20:48:01 +0200
Subject: [PATCH] Adapt the register_cover to the new datamodel
---
aleksis/apps/alsijil/tasks.py | 3 +++
.../alsijil/templates/alsijil/partials/register_cover.html | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/aleksis/apps/alsijil/tasks.py b/aleksis/apps/alsijil/tasks.py
index 70bf2ab45..8beaefbcb 100644
--- a/aleksis/apps/alsijil/tasks.py
+++ b/aleksis/apps/alsijil/tasks.py
@@ -159,6 +159,9 @@ def generate_full_register_printout(
# build the query-set
group = Group.objects.filter(pk=group)
+ if include_cover:
+ group = group.select_related("school_term")
+
if include_teachers_and_subjects_table:
group = group.prefetch_related(
"courses",
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/register_cover.html b/aleksis/apps/alsijil/templates/alsijil/partials/register_cover.html
index 193e19094..ba0eb5b86 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/register_cover.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/register_cover.html
@@ -1,7 +1,7 @@
<div class="center-align">
<h1>{% trans 'Class register' %}</h1>
- <h5>{{ school_term }}</h5>
- <p>({{ school_term.date_start }}–{{ school_term.date_end }})</p>
+ <h5>{{ group.school_term }}</h5>
+ <p>({{ group.school_term.date_start }}–{{ group.school_term.date_end }})</p>
{% static "img/aleksis-banner.svg" as aleksis_banner %}
<img src="{% firstof SITE_PREFERENCES.theme__logo.url aleksis_banner %}"
alt="{{ SITE_PREFERENCES.general__title }} – Logo" class="max-size-600 center">
--
GitLab