From e6b86387719a8a958a16ea5f6b2a2b68c6db3010 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sat, 13 Jun 2020 17:46:01 +0200
Subject: [PATCH] Use SchoolTerm instead of SchoolYear and catch non-existing
school term
---
aleksis/apps/alsijil/views.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index 7b594f25b..24c242471 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -14,7 +14,7 @@ from calendarweek import CalendarWeek
from django_tables2 import RequestConfig
from aleksis.apps.chronos.models import LessonPeriod
-from aleksis.core.models import Group, Person, SchoolYear
+from aleksis.core.models import Group, Person, SchoolTerm
from aleksis.core.util import messages
from .forms import (
@@ -238,9 +238,14 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
.prefetch_related("documentations", "personal_notes")
)
+ current_school_term = SchoolTerm.current
+
+ if not current_school_term:
+ return HttpResponseNotFound(_("There is no current school term."))
+
weeks = CalendarWeek.weeks_within(
- SchoolYear.current.date_start,
- SchoolYear.current.date_end,
+ current_school_term.date_start,
+ current_school_term.date_end,
)
periods_by_day = {}
--
GitLab