diff --git a/aleksis/core/menus.py b/aleksis/core/menus.py index 70c765cea0766f39db165aaf20ef20438042281e..bc68f034dfe665ea7e0447925075aec5bcc887cb 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 5e4a711ba730d16c737c4d5c2aa4cd03c45af587..9c05d1cabdb2b627826516742922c76e0ec13fce 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 865a9937c4c77b373b3bcec7257ed815b94fa78d..ad91fd8b6a3e0e1ecd83fb2e63bf27c5bb57b768 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 = {}