From faa0f9a72cf3d51167efc99fd649d9d4287cc366 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sat, 11 Sep 2021 21:45:55 +0200
Subject: [PATCH] Update rule names

---
 aleksis/apps/ticdesk/menus.py | 20 ++++++++++----------
 aleksis/apps/ticdesk/rules.py | 32 ++++++++++++++++----------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/aleksis/apps/ticdesk/menus.py b/aleksis/apps/ticdesk/menus.py
index 9c15a75..8202cec 100644
--- a/aleksis/apps/ticdesk/menus.py
+++ b/aleksis/apps/ticdesk/menus.py
@@ -9,7 +9,7 @@ MENUS = {
             "icon": "confirmation_number",
             "root": True,
             "validators": [
-                ("aleksis.core.util.predicates.permission_validator", "ticdesk.view_vouchers",)
+                ("aleksis.core.util.predicates.permission_validator", "ticdesk.view_vouchers_rule",)
             ],
             "submenu": [
                 {
@@ -19,7 +19,7 @@ MENUS = {
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.edit_vouchers",
+                            "ticdesk.edit_vouchers_rule",
                         )
                     ],
                 },
@@ -30,7 +30,7 @@ MENUS = {
                     "validator": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.create_vouchers",
+                            "ticdesk.create_vouchers_rule",
                         )
                     ],
                 },
@@ -42,7 +42,7 @@ MENUS = {
             "icon": "event_note",
             "root": True,
             "validators": [
-                ("aleksis.core.util.predicates.permission_validator", "ticdesk.edit_events",)
+                ("aleksis.core.util.predicates.permission_validator", "ticdesk.edit_events_rule",)
             ],
             "submenu": [
                 {
@@ -52,7 +52,7 @@ MENUS = {
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.create_events",
+                            "ticdesk.create_events_rule",
                         )
                     ],
                 },
@@ -63,7 +63,7 @@ MENUS = {
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.view_feedback_aspects",
+                            "ticdesk.view_feedback_aspects_rule",
                         )
                     ],
                 },
@@ -74,7 +74,7 @@ MENUS = {
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.generate_lists",
+                            "ticdesk.generate_lists_rule",
                         )
                     ],
                 },
@@ -85,7 +85,7 @@ MENUS = {
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.edit_events",
+                            "ticdesk.edit_events_rule",
                         )
                     ],
                 },
@@ -96,7 +96,7 @@ MENUS = {
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.view_registrations",
+                            "ticdesk.view_registrations_rule",
                         )
                     ],
                 },
@@ -110,7 +110,7 @@ MENUS = {
             "validators": [
                 (
                     "aleksis.core.util.predicates.permission_validator",
-                    "ticdesk.view_teckids_members",
+                    "ticdesk.view_teckids_members_rule",
                 )
             ],
             "submenu": [
diff --git a/aleksis/apps/ticdesk/rules.py b/aleksis/apps/ticdesk/rules.py
index 9dd51d7..7f96d8f 100644
--- a/aleksis/apps/ticdesk/rules.py
+++ b/aleksis/apps/ticdesk/rules.py
@@ -20,63 +20,63 @@ from .predicates import (
 view_vouchers_predicate = has_person & (
     has_global_perm("ticdesk.view_voucher") | has_any_object("ticdesk.view_voucher", Voucher)
 )
-rules.add_perm("ticdesk.view_vouchers", view_vouchers_predicate)
+rules.add_perm("ticdesk.view_vouchers_rule", view_vouchers_predicate)
 
 # Edit vouchers
 edit_vouchers_predicate = has_person & (
     has_global_perm("ticdesk.edit_voucher") | has_any_object("ticdesk.edit_voucher", Voucher)
 )
-rules.add_perm("ticdesk.edit_vouchers", edit_vouchers_predicate)
+rules.add_perm("ticdesk.edit_vouchers_rule", edit_vouchers_predicate)
 
 
 # Delete vouchers
 delete_vouchers_predicate = has_person & (
     has_global_perm("ticdesk.delete_voucher") | has_any_object("ticdesk.delete_voucher", Voucher)
 )
-rules.add_perm("ticdesk.delete_vouchers", delete_vouchers_predicate)
+rules.add_perm("ticdesk.delete_vouchers_rule", delete_vouchers_predicate)
 
 # Create vouchers
 create_vouchers_predicate = has_person & (
     has_global_perm("ticdesk.create_voucher") | has_any_object("ticdesk.create_voucher", Voucher)
 )
-rules.add_perm("ticdesk.create_vouchers", create_vouchers_predicate)
+rules.add_perm("ticdesk.create_vouchers_rule", create_vouchers_predicate)
 
 # Edit events
 edit_events_predicate = has_person & (
     has_global_perm("ticdesk.edit_event") | has_any_object("ticdesk.edit_event", TeckidsEvent)
 )
-rules.add_perm("ticdesk.edit_events", edit_events_predicate)
+rules.add_perm("ticdesk.edit_events_rule", edit_events_predicate)
 
 
 # Delete events
 delete_events_predicate = has_person & (
     has_global_perm("ticdesk.delete_event") | has_any_object("ticdesk.delete_event", TeckidsEvent)
 )
-rules.add_perm("ticdesk.delete_events", delete_events_predicate)
+rules.add_perm("ticdesk.delete_events_rule", delete_events_predicate)
 
 # Create events
 create_events_predicate = has_person & (
     has_global_perm("ticdesk.create_event") | has_any_object("ticdesk.create_event", TeckidsEvent)
 )
-rules.add_perm("ticdesk.create_events", create_events_predicate)
+rules.add_perm("ticdesk.create_events_rule", create_events_predicate)
 
 # Allowed to see group
 may_see_group_predicate = has_person & (
     is_group_member | has_any_object("core.view_group", Group) | see_group_by_grouptype
 )
-rules.add_perm("ticdesk.may_see_group", may_see_group_predicate)
+rules.add_perm("ticdesk.may_see_group_rule", may_see_group_predicate)
 
 may_see_person_predicate = has_person & (
     see_owned_groups_members | has_object_perm("core.view_person")
 )
-rules.add_perm("ticdesk.may_see_person", may_see_person_predicate)
+rules.add_perm("ticdesk.see_person_rule", may_see_person_predicate)
 
 # View registrations
 view_registrations_predicate = has_person & (
     has_global_perm("ticdesk.view_registration")
     | has_any_object("ticdesk.view_registration", EventRegistration)
 )
-rules.add_perm("ticdesk.view_registrations", view_registrations_predicate)
+rules.add_perm("ticdesk.view_registrations_rule", view_registrations_predicate)
 
 
 # Manage registrations
@@ -85,14 +85,14 @@ manage_registrations_predicate = has_person & (
     | is_own_registration
     | has_any_object("ticdesk.manage_registration", EventRegistration)
 )
-rules.add_perm("ticdesk.manage_registrations", manage_registrations_predicate)
+rules.add_perm("ticdesk.manage_registrations_rule", manage_registrations_predicate)
 
 # Delete registrations
 delete_registrations_predicate = has_person & (
     has_global_perm("ticdesk.delete_registration")
     | has_any_object("ticdesk.delete_registration", EventRegistration)
 )
-rules.add_perm("ticdesk.delete_registrations", delete_registrations_predicate)
+rules.add_perm("ticdesk.delete_registrations_rule", delete_registrations_predicate)
 
 
 # View teckids_members
@@ -100,7 +100,7 @@ view_teckids_members_predicate = has_person & (
     has_global_perm("ticdesk.view_teckids_member")
     | has_any_object("ticdesk.view_teckids_member", TeckidsMember)
 )
-rules.add_perm("ticdesk.view_teckids_members", view_teckids_members_predicate)
+rules.add_perm("ticdesk.view_teckids_members_rule", view_teckids_members_predicate)
 
 
 # Manage teckids_members
@@ -108,12 +108,12 @@ manage_teckids_members_predicate = has_person & (
     has_global_perm("ticdesk.manage_teckids_member")
     | has_any_object("ticdesk.manage_teckids_member", TeckidsMember)
 )
-rules.add_perm("ticdesk.manage_teckids_members", manage_teckids_members_predicate)
+rules.add_perm("ticdesk.manage_teckids_members_rule", manage_teckids_members_predicate)
 
 
 # Is own voucher?
 is_own_voucher_predicate = has_person & (is_own_voucher)
-rules.add_perm("ticdesk.is_own_voucher", is_own_voucher_predicate)
+rules.add_perm("ticdesk.is_own_voucher_rule", is_own_voucher_predicate)
 
 
 # View feedback aspects
@@ -121,4 +121,4 @@ view_feedback_aspects_predicate = has_person & (
     has_global_perm("ticdesk.view_feedback_aspect")
     | has_any_object("ticdesk.view_feedback_aspect", FeedbackAspect)
 )
-rules.add_perm("ticdesk.view_feedback_aspects", view_feedback_aspects_predicate)
+rules.add_perm("ticdesk.view_feedback_aspects_rule", view_feedback_aspects_predicate)
-- 
GitLab