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

Merge branch '198-remove-references-to-is_active-parameter' into 'master'

Resolve "Remove references to is_active parameter"

Closes #198

See merge request !259
parents 5a9b45a6 cb69ec58
No related branches found
No related tags found
1 merge request!259Resolve "Remove references to is_active parameter"
Pipeline #49473 passed
......@@ -154,7 +154,6 @@ def get_personal_notes(
no_personal_notes=~Exists(PersonalNote.objects.filter(person__pk=OuterRef("pk"), **q_attrs))
).filter(
member_of__in=Group.objects.filter(pk__in=self.get_groups().all()),
is_active=True,
no_personal_notes=True,
)
......
......@@ -428,7 +428,7 @@ def week_view(
if lesson_periods_pk or events_pk or extra_lessons_pk:
# Aggregate all personal notes for this group and week
persons_qs = Person.objects.filter(is_active=True)
persons_qs = Person.objects.all()
if not request.user.has_perm("alsijil.view_week_personalnote_rule", instance):
persons_qs = persons_qs.filter(pk=request.user.person.pk)
......
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