From 477a8617241b3d795df984d078bad4ef7a6d31cf Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 16 May 2024 19:58:01 +0200
Subject: [PATCH] Fix permission names
---
aleksis/apps/kolego/rules.py | 4 +---
aleksis/apps/kolego/schema/absence.py | 12 ++++++------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/aleksis/apps/kolego/rules.py b/aleksis/apps/kolego/rules.py
index 7082210..1bf5f20 100644
--- a/aleksis/apps/kolego/rules.py
+++ b/aleksis/apps/kolego/rules.py
@@ -50,7 +50,5 @@ delete_absencereason_predicate = has_person & (
)
rules.add_perm("kolego.delete_absencereason_rule", delete_absencereason_predicate)
-view_menu_predicate = has_person & (
- view_absences_predicate | view_absencereasons_predicate
-)
+view_menu_predicate = has_person & (view_absences_predicate | view_absencereasons_predicate)
rules.add_perm("kolego.view_menu_rule", view_menu_predicate)
diff --git a/aleksis/apps/kolego/schema/absence.py b/aleksis/apps/kolego/schema/absence.py
index bb66bf9..d79e18c 100644
--- a/aleksis/apps/kolego/schema/absence.py
+++ b/aleksis/apps/kolego/schema/absence.py
@@ -53,7 +53,7 @@ class AbsenceBatchCreateMutation(DjangoBatchCreateMutation):
model = Absence
fields = ("person", "reason", "comment", "datetime_start", "datetime_end")
optional_fields = ("comment", "reason")
- permissions = ("kolego.add_absence",) # FIXME
+ permissions = ("kolego.create_absence_rule",)
@classmethod
def handle_datetime_start(cls, value, name, info) -> int:
@@ -75,14 +75,14 @@ class AbsenceBatchCreateMutation(DjangoBatchCreateMutation):
class AbsenceBatchDeleteMutation(DjangoBatchDeleteMutation):
class Meta:
model = Absence
- permission_required = "kolego.delete_absence" # FIXME
+ permission_required = "kolego.delete_absence_rule"
class AbsenceBatchPatchMutation(PermissionBatchPatchMixin, DjangoBatchPatchMutation):
class Meta:
model = Absence
fields = ("id", "person", "reason", "comment", "datetime_start", "datetime_end")
- permissions = ("kolego.change_absence",) # FIXME
+ permissions = ("kolego.edit_absence_rule",)
@classmethod
def handle_datetime_start(cls, value, name, info) -> int:
@@ -106,17 +106,17 @@ class AbsenceReasonBatchCreateMutation(DjangoBatchCreateMutation):
model = AbsenceReason
fields = ("short_name", "name")
optional_fields = ("name",)
- permissions = ("kolego.create_absencereason",) # FIXME
+ permissions = ("kolego.create_absencereason_rule",)
class AbsenceReasonBatchDeleteMutation(DjangoBatchDeleteMutation):
class Meta:
model = AbsenceReason
- permission_required = "kolego.delete_absencereason" # FIXME
+ permission_required = "kolego.delete_absencereason_rule"
class AbsenceReasonBatchPatchMutation(PermissionBatchPatchMixin, DjangoBatchPatchMutation):
class Meta:
model = AbsenceReason
fields = ("id", "short_name", "name")
- permissions = ("kolego.change_absencereason",) # FIXME
+ permissions = ("kolego.edit_absencereason_rule",)
--
GitLab