From 0647a87fd52485898d4b58ef04d4dd938fa037bf Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 16 Aug 2022 14:29:04 +0200
Subject: [PATCH] Fix permissions
---
aleksis/apps/kort/menus.py | 12 +++++++-----
aleksis/apps/kort/rules.py | 5 +++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/aleksis/apps/kort/menus.py b/aleksis/apps/kort/menus.py
index 2f6f644..939fe3f 100644
--- a/aleksis/apps/kort/menus.py
+++ b/aleksis/apps/kort/menus.py
@@ -8,8 +8,10 @@ MENUS = {
"root": True,
"svg_icon": "mdi:card-account-details-outline",
"validators": [
- "menu_generator.validators.is_authenticated",
- "aleksis.core.util.core_helpers.has_person",
+ (
+ "aleksis.core.util.predicates.permission_validator",
+ "kort.view_menu_rule",
+ )
],
"submenu": [
{
@@ -19,7 +21,7 @@ MENUS = {
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
- "core.view_cards_rule",
+ "kort.view_cards_rule",
)
],
},
@@ -30,7 +32,7 @@ MENUS = {
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
- "core.view_cardprinters_rule",
+ "kort.view_cardprinters_rule",
)
],
},
@@ -41,7 +43,7 @@ MENUS = {
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
- "core.view_cardlayouts_rule",
+ "kort.view_cardlayouts_rule",
)
],
},
diff --git a/aleksis/apps/kort/rules.py b/aleksis/apps/kort/rules.py
index 1a11007..e4bcf20 100644
--- a/aleksis/apps/kort/rules.py
+++ b/aleksis/apps/kort/rules.py
@@ -85,3 +85,8 @@ add_rule("kort.print_card_rule", print_card_predicate)
deactivate_card_predicate = edit_card_predicate
add_rule("kort.deactivate_card_rule", deactivate_card_predicate)
+
+view_menu_predicate = (
+ view_cards_predicate | view_card_printers_predicate | view_card_layouts_predicate
+)
+add_rule("kort.view_menu_rule", view_menu_predicate)
--
GitLab