Skip to content
Snippets Groups Projects
Verified Commit 3aca4b88 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Fix regression in preloading.

parent db488728
No related branches found
No related tags found
No related merge requests found
...@@ -97,7 +97,13 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i ...@@ -97,7 +97,13 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
lesson_period=OuterRef('pk'), lesson_period=OuterRef('pk'),
week=wanted_week.week week=wanted_week.week
)) ))
).in_week(wanted_week) ).in_week(
wanted_week
).select_related(
'lesson', 'lesson__subject', 'period', 'room'
).prefetch_related(
'lesson__groups', 'lesson__teachers', 'substitutions'
)
group = None # FIXME workaround for #38 group = None # FIXME workaround for #38
if request.GET.get('group', None) or request.GET.get('teacher', None) or request.GET.get('room', None): if request.GET.get('group', None) or request.GET.get('teacher', None) or request.GET.get('room', None):
...@@ -172,8 +178,10 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -172,8 +178,10 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
# Get all lesson periods for the selected group # Get all lesson periods for the selected group
lesson_periods = LessonPeriod.objects.filter_group( lesson_periods = LessonPeriod.objects.filter_group(
group group
).distinct().prefetch_related( ).distinct().select_related(
'documentations', 'personal_notes' 'lesson', 'lesson__subject', 'period', 'room'
).prefetch_related(
'lesson__groups', 'lesson__teachers', 'substitutions', 'documentations', 'personal_notes'
) )
weeks = CalendarWeek.weeks_within(group.school.current_term.date_start, group.school.current_term.date_end) weeks = CalendarWeek.weeks_within(group.school.current_term.date_start, group.school.current_term.date_end)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment