diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ac120afb8fd683e0db787cac9460f8c9938cd884..ada77297106d287fca238770c9dd06db3ac05292 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,6 +16,7 @@ Bugfixes * Show lesson documentations in printout again. * Allow pages overflowing in printout +* Show all relevant personal notes in week view. `1.0a2`_ -------- diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py index bea753276aa3130eafffe7aeb28f08ad816bb312..e2be251c4c95289e13468e43ea36ed262ac46561 100644 --- a/biscuit/apps/alsijil/views.py +++ b/biscuit/apps/alsijil/views.py @@ -122,7 +122,7 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i persons = Person.objects.filter( is_active=True ).filter( - Q(member_of=group) | Q(member_of__parent_groups=group) + member_of__lessons__lesson_periods__in=lesson_periods ).distinct().prefetch_related( 'personal_notes' ).annotate(