From f50c635e22f64a945ebd1c9b58b125fc0e6f0c23 Mon Sep 17 00:00:00 2001 From: magicfelix <felix@felix-zauberer.de> Date: Wed, 5 Feb 2025 16:12:44 +0100 Subject: [PATCH] Fix get_objects to accept start_qs and additional_filter --- aleksis/apps/chronos/models.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index 4017ddda..c0545a6f 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -518,10 +518,18 @@ class LessonEvent(CalendarEvent): if prefetch_absences: prefetch_fields.append("teachers__kolego_absences") + if "start_qs" in kwargs: + start_qs = kwargs.pop("start_qs") + else: + start_qs = cls.objects.not_instance_of(SupervisionEvent) + + if "additional_filter" in kwargs: + q = q & kwargs.pop("additional_filter") + objs = super().get_objects( request, params, - start_qs=cls.objects.not_instance_of(SupervisionEvent), + start_qs=start_qs, additional_filter=q, select_related=["subject", "course"], prefetch_related=prefetch_fields, -- GitLab