From c27f97ba246bf1890cff29736bea0ad127c03e7e Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Sun, 3 Nov 2024 19:46:44 +0100
Subject: [PATCH] Fix primary group permission
---
aleksis/apps/chronos/util/chronos_helpers.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/aleksis/apps/chronos/util/chronos_helpers.py b/aleksis/apps/chronos/util/chronos_helpers.py
index 6c8600f9..2bb9ae13 100644
--- a/aleksis/apps/chronos/util/chronos_helpers.py
+++ b/aleksis/apps/chronos/util/chronos_helpers.py
@@ -46,13 +46,13 @@ def get_groups(user: "User"):
groups = groups.order_by("short_name", "name")
if not check_global_permission(user, "chronos.view_all_group_timetables"):
- if user.person.primary_group:
- return groups.filter(pk=user.person.primary_group.pk)
-
wanted_groups = get_objects_for_user(user, "core.view_group_timetable", groups)
groups = groups.filter(
- Q(pk__in=wanted_groups) | Q(members=user.person) | Q(owners=user.person)
+ Q(pk__in=wanted_groups)
+ | Q(members=user.person)
+ | Q(owners=user.person)
+ | Q(pk=user.person.primary_group.pk if user.person.primary_group else None)
)
groups = groups.distinct()
--
GitLab