From 79912be6511cac8d2b2c916c98d3044922fe1a7a Mon Sep 17 00:00:00 2001
From: Hangzhi <hangzhi@protonmail.com>
Date: Mon, 20 Apr 2020 18:31:22 +0200
Subject: [PATCH] Replace admin section validators with django-rules-based
custom validators in menu
---
aleksis/core/menus.py | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/aleksis/core/menus.py b/aleksis/core/menus.py
index 74fee9558..18cf14ee8 100644
--- a/aleksis/core/menus.py
+++ b/aleksis/core/menus.py
@@ -59,8 +59,7 @@ MENUS = {
"url": "#",
"icon": "security",
"validators": [
- "menu_generator.validators.is_authenticated",
- "menu_generator.validators.is_superuser",
+ ("aleksis.core.util.predicates.permission_validator", "core.view_admin_menu"),
],
"submenu": [
{
@@ -68,8 +67,7 @@ MENUS = {
"url": "announcements",
"icon": "announcement",
"validators": [
- "menu_generator.validators.is_authenticated",
- "menu_generator.validators.is_superuser",
+ ("aleksis.core.util.predicates.permission_validator", "core.view_announcements"),
],
},
{
@@ -77,8 +75,7 @@ MENUS = {
"url": "data_management",
"icon": "view_list",
"validators": [
- "menu_generator.validators.is_authenticated",
- "menu_generator.validators.is_superuser",
+ ("aleksis.core.util.predicates.permission_validator", "core.manage_data"),
],
},
{
@@ -86,8 +83,7 @@ MENUS = {
"url": "system_status",
"icon": "power_settings_new",
"validators": [
- "menu_generator.validators.is_authenticated",
- "menu_generator.validators.is_superuser",
+ ("aleksis.core.util.predicates.permission_validator", "core.view_system_status"),
],
},
{
@@ -95,8 +91,7 @@ MENUS = {
"url": "impersonate-list",
"icon": "people",
"validators": [
- "menu_generator.validators.is_authenticated",
- "menu_generator.validators.is_superuser",
+ ("aleksis.core.util.predicates.permission_validator", "core.impersonate"),
],
},
{
@@ -104,8 +99,7 @@ MENUS = {
"url": "school_management",
"icon": "school",
"validators": [
- "menu_generator.validators.is_authenticated",
- "menu_generator.validators.is_superuser",
+ ("aleksis.core.util.predicates.permission_validator", "core.manage_school"),
],
},
{
--
GitLab