diff --git a/aleksis/apps/kolego/rules.py b/aleksis/apps/kolego/rules.py index 70822107276f5cec2eb4723be73052a1e0df02e7..1bf5f206bc91e604ee381d94624bc973236d547e 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 bb66bf940d0d451e1993dc822901b350b1025a25..d79e18c116e92745c7ccea280496aef3b58ceed4 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",)