diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py index 5c5fbaadc39df82d05380ba3eb99ef6845c74287..8f27bb203500723dc43afbdbca33e3e3b1023da5 100644 --- a/biscuit/apps/alsijil/views.py +++ b/biscuit/apps/alsijil/views.py @@ -136,8 +136,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i elif 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']))) + Q(lesson__groups=group) | Q(lesson__groups__parent_groups=group)) + else: + lesson_periods = None + if lesson_periods: # Aggregate all personal notes for this group and week persons = Person.objects.filter( is_active=True @@ -163,14 +166,11 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i )) ) else: - lesson_periods = None persons = None # Add a form to filter the view select_form = SelectForm(request.GET or None) - - context['current_head'] = str(wanted_week) context['week'] = wanted_week context['group'] = group @@ -185,7 +185,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i context['url_prev'] = '%s?%s' % (reverse('week_view_by_week', args=[week_prev.year, week_prev.week]), request.GET.urlencode()) context['url_next'] = '%s?%s' % (reverse('week_view_by_week', args=[week_next.year, week_next.week]), request.GET.urlencode()) - return render(request, 'alsijil/week_view.html', context)