From 9528d512e40a58ff2f4be65875366f3a0081b8a7 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Mon, 11 Nov 2019 21:46:46 +0100
Subject: [PATCH] Fix check if group is selected.
---
biscuit/apps/alsijil/views.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 75854dd77..6bbc146fc 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -97,6 +97,10 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
group = None # FIXME workaround for #38
if request.GET.get('group', None) or request.GET.get('teacher', None) or request.GET.get('room', None):
lesson_periods = lesson_periods.filter_from_query(request.GET)
+ if 'group' in request.GET and request.GET['group']:
+ group = Group.objects.get(pk=request.GET['group'])
+ else:
+ group = None
elif hasattr(request, 'user') and hasattr(request.user, 'person'):
group = request.user.person.owner_of.first()
lesson_periods = lesson_periods.filter_group(group)
@@ -138,6 +142,7 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
context['week'] = wanted_week
context['lesson_periods'] = lesson_periods
context['persons'] = persons
+ context['group'] = group
context['select_form'] = select_form
week_prev = wanted_week - 1
--
GitLab