From cb69ec589c289b844c060596d088c395340de1ee Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Sun, 9 Jan 2022 13:57:30 +0100
Subject: [PATCH] Remove references to the removed is_active attribute of
Person class instances
---
aleksis/apps/alsijil/model_extensions.py | 1 -
aleksis/apps/alsijil/views.py | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py
index 53578423a..c5502d54e 100644
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
@@ -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,
)
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index 8a0b6b4fa..1fe31fd27 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -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)
--
GitLab