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

Merge branch '38-week-view-personal-notes-only-work-when-filtering-by-group' into 'master'

Resolve "[Week view] personal notes only work when filtering by group"

Closes #38

See merge request BiscuIT/BiscuIT-App-Alsijil!30
parents f4748e7d 1c5c71a5
No related branches found
No related tags found
1 merge request!30Resolve "[Week view] personal notes only work when filtering by group"
......@@ -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`_
--------
......
......@@ -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(
......
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