From 6f701073472559d99cc749692bd5a5a83e95ba9d Mon Sep 17 00:00:00 2001
From: Michael Bauer <michael-bauer@posteo.de>
Date: Fri, 6 Dec 2024 15:50:39 +0100
Subject: [PATCH] Port documentation-filter-logic from model_extensions
---
aleksis/apps/alsijil/tasks.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/aleksis/apps/alsijil/tasks.py b/aleksis/apps/alsijil/tasks.py
index cec0a8808..59d2ad277 100644
--- a/aleksis/apps/alsijil/tasks.py
+++ b/aleksis/apps/alsijil/tasks.py
@@ -106,7 +106,14 @@ def generate_full_register_printout(
documentations = Documentation.objects.filter(
Q(datetime_start__date__gte=group.school_term.date_start)
& Q(datetime_end__date__lte=group.school_term.date_end)
- & (Q(course__groups=group) | Q(course__groups__parent_groups=group))
+ & Q(pk__in=Documentation.objects.filter(course__groups=group)
+ .values_list("pk", flat=True)
+ .union(
+ Documentation.objects.filter(course__groups__parent_groups=group).values_list(
+ "pk", flat=True
+ )
+ )
+ )
)
if include_members_table or include_person_overviews:
--
GitLab