From 56c539c95444b1dc829832594075229cc7718c43 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sat, 11 Sep 2021 23:35:54 +0200
Subject: [PATCH] Rename rules
---
aleksis/apps/ticdesk/menus.py | 8 ++++----
aleksis/apps/ticdesk/rules.py | 14 +++++++-------
aleksis/apps/ticdesk/views.py | 8 ++++----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/aleksis/apps/ticdesk/menus.py b/aleksis/apps/ticdesk/menus.py
index 8202cec..cd8ac26 100644
--- a/aleksis/apps/ticdesk/menus.py
+++ b/aleksis/apps/ticdesk/menus.py
@@ -19,7 +19,7 @@ MENUS = {
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
- "ticdesk.edit_vouchers_rule",
+ "ticdesk.change_vouchers_rule",
)
],
},
@@ -42,7 +42,7 @@ MENUS = {
"icon": "event_note",
"root": True,
"validators": [
- ("aleksis.core.util.predicates.permission_validator", "ticdesk.edit_events_rule",)
+ ("aleksis.core.util.predicates.permission_validator", "ticdesk.change_events_rule",)
],
"submenu": [
{
@@ -81,11 +81,11 @@ MENUS = {
{
"name": _("Manage upcoming events"),
"url": "manage_events",
- "icon": "edit",
+ "icon": "change",
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
- "ticdesk.edit_events_rule",
+ "ticdesk.change_events_rule",
)
],
},
diff --git a/aleksis/apps/ticdesk/rules.py b/aleksis/apps/ticdesk/rules.py
index 2574ceb..fd7f49e 100644
--- a/aleksis/apps/ticdesk/rules.py
+++ b/aleksis/apps/ticdesk/rules.py
@@ -24,10 +24,10 @@ view_vouchers_predicate = has_person & (
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)
+change_vouchers_predicate = has_person & (
+ has_global_perm("ticdesk.change_voucher") | has_any_object("ticdesk.change_voucher", Voucher)
)
-rules.add_perm("ticdesk.edit_vouchers_rule", edit_vouchers_predicate)
+rules.add_perm("ticdesk.change_vouchers_rule", change_vouchers_predicate)
# Delete vouchers
@@ -43,11 +43,11 @@ create_vouchers_predicate = has_person & (
rules.add_perm("ticdesk.create_vouchers_rule", create_vouchers_predicate)
# Edit events
-edit_events_predicate = has_person & (
- has_global_perm("ticdesk.edit_teckidsevent")
- | has_any_object("ticdesk.edit_teckidsevent", TeckidsEvent)
+change_events_predicate = has_person & (
+ has_global_perm("ticdesk.change_teckidsevent")
+ | has_any_object("ticdesk.change_teckidsevent", TeckidsEvent)
)
-rules.add_perm("ticdesk.edit_events_rule", edit_events_predicate)
+rules.add_perm("ticdesk.change_events_rule", change_events_predicate)
# Delete events
diff --git a/aleksis/apps/ticdesk/views.py b/aleksis/apps/ticdesk/views.py
index de225fe..21d1d4b 100644
--- a/aleksis/apps/ticdesk/views.py
+++ b/aleksis/apps/ticdesk/views.py
@@ -268,7 +268,7 @@ def feedback_event(request, id_):
return render(request, "ticdesk/teckids_event/feedback.html", context)
-@permission_required("ticdesk.edit_event", fn=objectgetter_optional(TeckidsEvent, None, False))
+@permission_required("ticdesk.change_event", fn=objectgetter_optional(TeckidsEvent, None, False))
def edit_event(request: HttpRequest, id_: Optional[int] = None) -> HttpResponse:
"""View to edit or create an event."""
context = {}
@@ -308,7 +308,7 @@ class ManageEvents(ListView, PermissionRequiredMixin):
"""View listing upcoming events."""
template_name = "ticdesk/teckids_event/manage.html"
- permission_required = "ticdesk.edit_events"
+ permission_required = "ticdesk.change_events"
context = {}
def get_queryset(self):
@@ -357,7 +357,7 @@ def delete_voucher(request, id_):
return redirect("vouchers")
-@permission_required("ticdesk.edit_voucher", fn=objectgetter_optional(Voucher, None, False))
+@permission_required("ticdesk.change_voucher", fn=objectgetter_optional(Voucher, None, False))
def edit_voucher(request: HttpRequest, id_: Optional[int] = None) -> HttpResponse:
"""View to edit or create a voucher."""
context = {}
@@ -583,7 +583,7 @@ def feedback_aspects(request: HttpRequest) -> HttpResponse:
@permission_required(
- "ticdesk.edit_feedback_aspect", fn=objectgetter_optional(FeedbackAspect, None, False),
+ "ticdesk.change_feedback_aspect", fn=objectgetter_optional(FeedbackAspect, None, False),
)
def edit_feedback_aspect(request: HttpRequest, id_: Optional[int] = None) -> HttpResponse:
"""View to edit or create an feedback_aspect."""
--
GitLab