Merge branch 'nix-shell' into 'main'

Nix shell See merge request bde/nk20!201
Merge branch 'quark-main-patch-05186' into 'main'
2024-09-12 02:29:39 +02:00 · 2024-09-09 21:02:19 +02:00 · 2024-09-09 19:05:53 +02:00
1 changed files with 2 additions and 3 deletions
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@ -265,12 +265,11 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
        # Keep only users that have a note
        note_qs = note_qs.filter(note__noteuser__isnull=False)

-        # Keep only members
+        # Keep only valid members
        note_qs = note_qs.filter(
            note__noteuser__user__memberships__club=activity.attendees_club,
            note__noteuser__user__memberships__date_start__lte=timezone.now(),
-            note__noteuser__user__memberships__date_end__gte=timezone.now(),
-        )
+            note__noteuser__user__memberships__date_end__gte=timezone.now()).exclude(note__inactivity_reason='forced')

        # Filter with permission backend
        note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))
Author	SHA1	Message	Date
aeltheos	164725a6b8	Merge branch 'nix-shell' into 'main' Nix shell See merge request bde/nk20!201	2024-09-12 02:29:39 +02:00
quark	9162319734	Merge branch 'quark-main-patch-05186' into 'main' Update views.py (don't display forced blocked note, it's just temporary patch,... See merge request bde/nk20!272	2024-09-09 21:02:19 +02:00
quark	5d2a8e9b79	Update views.py (don't display forced blocked note, it's just temporary patch, we need to block these note in models too)	2024-09-09 19:05:53 +02:00