diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index 4017dddabd129797dc1e13c7424979121ae1a9ed..c0545a6f3ee0240e8bac52eeb1fb53cbbad11f41 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,