From 270125cebbc4c8e02fee4303a4b694d49ce8f04c Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Sat, 15 May 2021 15:57:22 +0200
Subject: [PATCH] Change faulty rule names
---
aleksis/core/menus.py | 4 ++--
aleksis/core/rules.py | 8 ++++----
aleksis/core/views.py | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/aleksis/core/menus.py b/aleksis/core/menus.py
index 70c765cea..bc68f034d 100644
--- a/aleksis/core/menus.py
+++ b/aleksis/core/menus.py
@@ -219,7 +219,7 @@ MENUS = {
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
- "core.view_group_type",
+ "core.view_grouptypes",
)
],
},
@@ -252,7 +252,7 @@ MENUS = {
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
- "core.view_additionalfield",
+ "core.view_additionalfields",
)
],
},
diff --git a/aleksis/core/rules.py b/aleksis/core/rules.py
index 5e4a711ba..9c05d1cab 100644
--- a/aleksis/core/rules.py
+++ b/aleksis/core/rules.py
@@ -218,11 +218,11 @@ delete_additional_field_predicate = has_person & (
rules.add_perm("core.delete_additionalfield", delete_additional_field_predicate)
# View additional fields
-view_additional_field_predicate = has_person & (
+view_additional_fields_predicate = has_person & (
has_global_perm("core.view_additionalfield")
| has_any_object("core.view_additionalfield", AdditionalField)
)
-rules.add_perm("core.view_additionalfield", view_additional_field_predicate)
+rules.add_perm("core.view_additionalfields", view_additional_fields_predicate)
# Edit group type
change_group_type_predicate = has_person & (
@@ -244,10 +244,10 @@ delete_group_type_predicate = has_person & (
rules.add_perm("core.delete_grouptype", delete_group_type_predicate)
# View group types
-view_group_type_predicate = has_person & (
+view_group_types_predicate = has_person & (
has_global_perm("core.view_grouptype") | has_any_object("core.view_grouptype", GroupType)
)
-rules.add_perm("core.view_grouptype", view_group_type_predicate)
+rules.add_perm("core.view_grouptypes", view_group_types_predicate)
# Create person
create_person_predicate = has_person & (
diff --git a/aleksis/core/views.py b/aleksis/core/views.py
index 865a9937c..ad91fd8b6 100644
--- a/aleksis/core/views.py
+++ b/aleksis/core/views.py
@@ -699,7 +699,7 @@ def edit_additional_field(request: HttpRequest, id_: Optional[int] = None) -> Ht
return render(request, "core/additional_field/edit.html", context)
-@permission_required("core.view_additionalfield")
+@permission_required("core.view_additionalfields")
def additional_fields(request: HttpRequest) -> HttpResponse:
"""List view for listing all additional fields."""
context = {}
@@ -758,7 +758,7 @@ def edit_group_type(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
return render(request, "core/group_type/edit.html", context)
-@permission_required("core.view_grouptype")
+@permission_required("core.view_grouptypes")
def group_types(request: HttpRequest) -> HttpResponse:
"""List view for listing all group types."""
context = {}
--
GitLab