From 24245204aa0b58545dc44ae1871e4b040d08226b Mon Sep 17 00:00:00 2001 From: Dominik George <nik@naturalnet.de> Date: Tue, 19 Jan 2021 13:26:57 +0100 Subject: [PATCH] Eliminate one DB query in full_register_group The `or` operator puts the QuerySet into boolean context, which triggers evaluation. --- aleksis/apps/alsijil/model_extensions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py index 7ab840196..ecfe92406 100644 --- a/aleksis/apps/alsijil/model_extensions.py +++ b/aleksis/apps/alsijil/model_extensions.py @@ -276,7 +276,9 @@ def generate_person_list_with_class_register_statistics( self: Group, persons: Optional[Iterable] = None ) -> QuerySet: """Get with class register statistics annotated list of all members.""" - persons = persons or self.members.all() + if persons is None: + persons = self.members.all() + persons = persons.filter( personal_notes__groups_of_person=self, personal_notes__lesson_period__lesson__validity__school_term=self.school_term, -- GitLab