From e72268cdd0bb93f0f67b87f2f4a2ba815ed9a6d3 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Mon, 30 Sep 2019 21:25:45 +0200
Subject: [PATCH] Fix view.
---
biscuit/apps/alsijil/views.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index d87190287..f1de48b9a 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -125,11 +125,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
group = Group.objects.get(pk=request.GET['group'])
lesson_periods = lesson_periods.filter(
Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group'])))
- elif hasattr(request, 'user') and hasattr(request.user, 'person'):
- # Try to select group from owned groups of user
- group = request.user.person.owner_of.first()
- lesson_periods = lesson_periods.filter(
- Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group'])))
if 'teacher' in request.GET and request.GET['teacher']:
teacher = Person.objects.get(pk=request.GET['teacher'])
lesson_periods = lesson_periods.filter(
@@ -138,6 +133,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
room = Room.objects.get(pk=request.GET['room'])
lesson_periods = lesson_periods.filter(
room__pk=int(request.GET['room']))
+ elif:
+ if hasattr(request, 'user') and hasattr(request.user, 'person'):
+ group = request.user.person.owner_of.first()
+ lesson_periods = lesson_periods.filter(
+ Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group'])))
# Aggregate all personal notes for this group and week
persons = Person.objects.filter(
--
GitLab