From fbbb60202f35dbc772dae33d32012c2b8d0f11e5 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Fri, 19 Jun 2020 11:09:59 +0200
Subject: [PATCH] Fix permission names and core/alsijil relation
---
aleksis/apps/alsijil/model_extensions.py | 4 ++++
aleksis/apps/alsijil/rules.py | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py
index bebc8a5da..a2c3da752 100644
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
@@ -100,6 +100,10 @@ Group.add_permission(
"view_week_class_register_group",
_("Can view week overview of group class register"),
)
+Group.add_permission(
+ "view_lesson_class_register_group",
+ _("Can view lesson overview of group class register"),
+)
Group.add_permission(
"view_personalnote_group", _("Can view all personal notes of a group")
)
diff --git a/aleksis/apps/alsijil/rules.py b/aleksis/apps/alsijil/rules.py
index 54f3e7893..7f74dc103 100644
--- a/aleksis/apps/alsijil/rules.py
+++ b/aleksis/apps/alsijil/rules.py
@@ -24,7 +24,7 @@ view_lesson_predicate = has_person & (
| is_lesson_teacher
| is_lesson_participant
| is_lesson_parent_group_owner
- | has_lesson_group_object_perm("alsijil.view_lesson")
+ | has_lesson_group_object_perm("core.view_week_class_register_group")
)
add_perm("alsijil.view_lesson", view_lesson_predicate)
@@ -76,7 +76,7 @@ add_perm("alsijil.view_week", view_week_predicate)
# View week personal notes
view_week_personal_notes_predicate = has_person & (
has_global_perm("alsijil.view_personalnote")
- | has_object_perm("alsijil.view_personalnote")
+ | has_object_perm("core.view_personalnote_group")
| is_group_owner
)
add_perm("alsijil.view_week_personalnote", view_week_personal_notes_predicate)
--
GitLab