Fix rules

aleksis/apps/ticdesk/models.py

@@ -142,16 +142,16 @@ class GlobalPermissions(models.Model, PureDjangoModel):
     class Meta:
         managed = False
         permissions = (
-            ("view_vouchers", _("Can view vouchers")),
-            ("edit_vouchers", _("Can edit vouchers")),
-            ("delete_vouchers", _("Can delete vouchers")),
-            ("create_vouchers", _("Can create vouchers")),
-            ("edit_events", _("Can edit events")),
-            ("create_events", _("Can create events")),
-            ("delete_events", _("Can delete events")),
-            ("generate_lists", _("Can generate lists")),
-            ("manage_registrations", _("Can manage registrations")),
-            ("view_registrations", _("Can view registrations")),
+            ("view_voucher", _("Can view vouchers")),
+            ("edit_voucher", _("Can edit vouchers")),
+            ("delete_voucher", _("Can delete vouchers")),
+            ("create_voucher", _("Can create vouchers")),
+            ("edit_event", _("Can edit events")),
+            ("create_event", _("Can create events")),
+            ("delete_event", _("Can delete events")),
+            ("generate_list", _("Can generate lists")),
+            ("manage_registration", _("Can manage registrations")),
+            ("view_registration", _("Can view registrations")),
         )
 
     def __str__() -> str:

aleksis/apps/ticdesk/rules.py

@@ -19,45 +19,45 @@ from .predicates import (
 
 # View vouchers
 view_vouchers_predicate = has_person & (
-    has_global_perm("ticdesk.view_vouchers") | has_any_object("ticdesk.view_vouchers", Voucher)
+    has_global_perm("ticdesk.view_voucher") | has_any_object("ticdesk.view_voucher", Voucher)
 )
 rules.add_perm("ticdesk.view_vouchers", view_vouchers_predicate)
 
 # Edit vouchers
 edit_vouchers_predicate = has_person & (
-    has_global_perm("ticdesk.edit_vouchers") | has_any_object("ticdesk.edit_vouchers", Voucher)
+    has_global_perm("ticdesk.edit_voucher") | has_any_object("ticdesk.edit_voucher", Voucher)
 )
 rules.add_perm("ticdesk.edit_vouchers", edit_vouchers_predicate)
 
 
 # Delete vouchers
 delete_vouchers_predicate = has_person & (
-    has_global_perm("ticdesk.delete_vouchers") | has_any_object("ticdesk.delete_vouchers", Voucher)
+    has_global_perm("ticdesk.delete_voucher") | has_any_object("ticdesk.delete_voucher", Voucher)
 )
 rules.add_perm("ticdesk.delete_vouchers", delete_vouchers_predicate)
 
 # Create vouchers
 create_vouchers_predicate = has_person & (
-    has_global_perm("ticdesk.create_vouchers") | has_any_object("ticdesk.create_vouchers", Voucher)
+    has_global_perm("ticdesk.create_voucher") | has_any_object("ticdesk.create_voucher", Voucher)
 )
 rules.add_perm("ticdesk.create_vouchers", create_vouchers_predicate)
 
 # Edit events
 edit_events_predicate = has_person & (
-    has_global_perm("ticdesk.edit_events") | has_any_object("ticdesk.edit_events", TeckidsEvent)
+    has_global_perm("ticdesk.edit_event") | has_any_object("ticdesk.edit_event", TeckidsEvent)
 )
 rules.add_perm("ticdesk.edit_events", edit_events_predicate)
 
 
 # Delete events
 delete_events_predicate = has_person & (
-    has_global_perm("ticdesk.delete_events") | has_any_object("ticdesk.delete_events", TeckidsEvent)
+    has_global_perm("ticdesk.delete_event") | has_any_object("ticdesk.delete_event", TeckidsEvent)
 )
 rules.add_perm("ticdesk.delete_events", delete_events_predicate)
 
 # Create events
 create_events_predicate = has_person & (
-    has_global_perm("ticdesk.create_events") | has_any_object("ticdesk.create_events", TeckidsEvent)
+    has_global_perm("ticdesk.create_event") | has_any_object("ticdesk.create_event", TeckidsEvent)
 )
 rules.add_perm("ticdesk.create_events", create_events_predicate)
 
@@ -74,40 +74,40 @@ rules.add_perm("ticdesk.may_see_person", may_see_person_predicate)
 
 # View registrations
 view_registrations_predicate = has_person & (
-    has_global_perm("ticdesk.view_registrations")
-    | has_any_object("ticdesk.view_registrations", EventRegistration)
+    has_global_perm("ticdesk.view_registration")
+    | has_any_object("ticdesk.view_registration", EventRegistration)
 )
 rules.add_perm("ticdesk.view_registrations", view_registrations_predicate)
 
 
 # Manage registrations
 manage_registrations_predicate = has_person & (
-    has_global_perm("ticdesk.manage_registrations")
+    has_global_perm("ticdesk.manage_registration")
     | is_own_registration
-    | has_any_object("ticdesk.manage_registrations", EventRegistration)
+    | has_any_object("ticdesk.manage_registration", EventRegistration)
 )
 rules.add_perm("ticdesk.manage_registrations", manage_registrations_predicate)
 
 # Delete registrations
 delete_registrations_predicate = has_person & (
-    has_global_perm("ticdesk.delete_registrations")
-    | has_any_object("ticdesk.delete_registrations", EventRegistration)
+    has_global_perm("ticdesk.delete_registration")
+    | has_any_object("ticdesk.delete_registration", EventRegistration)
 )
 rules.add_perm("ticdesk.delete_registrations", delete_registrations_predicate)
 
 
 # View teckids_members
 view_teckids_members_predicate = has_person & (
-    has_global_perm("ticdesk.view_teckids_members")
-    | has_any_object("ticdesk.view_teckids_members", TeckidsMember)
+    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)
 
 
 # Manage teckids_members
 manage_teckids_members_predicate = has_person & (
-    has_global_perm("ticdesk.manage_teckids_members")
-    | has_any_object("ticdesk.manage_teckids_members", TeckidsMember)
+    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)
 
@@ -119,7 +119,7 @@ rules.add_perm("ticdesk.is_own_voucher", is_own_voucher_predicate)
 
 # View feedback aspects
 view_feedback_aspects_predicate = has_person & (
-    has_global_perm("ticdesk.view_feedback_aspects")
-    | has_any_object("ticdesk.view_feedback_aspects", FeedbackAspect)
+    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)