From 0df28697f6f4df93d01643acbc67810773abafb8 Mon Sep 17 00:00:00 2001
From: mirabilos <thorsten.glaser@teckids.org>
Date: Wed, 4 Sep 2019 00:39:12 +0200
Subject: [PATCH] =?UTF-8?q?This=20relation=20is=20complicated,=20let?=
=?UTF-8?q?=E2=80=99s=20see=20what=20it=20does=20without.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(This adds back several dozen SQL queries, tbf later.)
---
biscuit/apps/alsijil/views.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 9df61b1ac..2df8ebf24 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -99,12 +99,11 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse
periods_by_day_unsorted = {}
if group:
for act_group in [group] + list(group.child_groups.all()):
- for lesson in act_group.lessons.prefetch_related(
- 'lesson_period',
- 'lesson_period__period',
- 'lesson_period__period__lesson__teachers'
- ).filter(date_start__lte=week_start, date_end__gte=week_end):
- for lesson_period in lesson.lesson_periods.all():
+ for lesson in act_group.lessons.filter(date_start__lte=week_start, date_end__gte=week_end):
+ for lesson_period in lesson.lesson_periods.select_related(
+ 'period',
+ 'period__lesson__teachers'
+ ).all():
periods_by_day_unsorted.setdefault(
lesson_period.period.weekday, []).append(lesson_period)
--
GitLab