From c93dd3812c53d21ab8517dc7af72e1d4b70a1b04 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 16 Oct 2024 17:57:13 +0200 Subject: ♻ permissions refactoring: refactor has_permission methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archaeological_operations/ishtar_menu.py | 60 ++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 19 deletions(-) (limited to 'archaeological_operations/ishtar_menu.py') diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py index b58fb5078..31d7ade34 100644 --- a/archaeological_operations/ishtar_menu.py +++ b/archaeological_operations/ishtar_menu.py @@ -24,7 +24,7 @@ from ishtar_common.menu_base import SectionItem, MenuItem from ishtar_common.models import IshtarSiteProfile from archaeological_operations import models -# be careful: each access_controls must be relevant with check_rights in urls +# be careful: each access_controls must be relevant with check_permissions in urls MENU_SECTIONS = [ @@ -39,31 +39,43 @@ MENU_SECTIONS = [ "operation_search", _("Search"), model=models.Operation, - access_controls=["view_operation", "view_own_operation"], + access_controls=[ + "archaeological_operations.view_operation", + "archaeological_operations.view_own_operation" + ], ), MenuItem( "operation_creation", _("Creation"), model=models.Operation, - access_controls=["add_operation", "add_own_operation"], + access_controls=[ + "archaeological_operations.add_operation", + "archaeological_operations.add_own_operation" + ], ), MenuItem( "operation_modification", _("Modification"), model=models.Operation, - access_controls=["change_operation", "change_own_operation"], + access_controls=[ + "archaeological_operations.change_operation", + "archaeological_operations.change_own_operation" + ], ), MenuItem( "operation_closing", _("Closing"), model=models.Operation, - access_controls=["close_operation"], + access_controls=["archaeological_operations.close_operation"], ), MenuItem( "operation_deletion", _("Deletion"), model=models.Operation, - access_controls=["change_operation", "change_own_operation"], + access_controls=[ + "archaeological_operations.change_operation", + "archaeological_operations.change_own_operation" + ], ), SectionItem( "admin_act_operations", @@ -74,25 +86,33 @@ MENU_SECTIONS = [ "operation_administrativeactop_search", _("Search"), model=models.AdministrativeAct, - access_controls=["change_administrativeact"], + access_controls=[ + "archaeological_operations.change_administrativeact" + ], ), MenuItem( "operation_administrativeactop", _("Creation"), model=models.AdministrativeAct, - access_controls=["change_administrativeact"], + access_controls=[ + "archaeological_operations.change_administrativeact" + ], ), MenuItem( "operation_administrativeactop_modification", _("Modification"), model=models.AdministrativeAct, - access_controls=["change_administrativeact"], + access_controls=[ + "archaeological_operations.change_administrativeact" + ], ), MenuItem( "operation_administrativeactop_deletion", _("Deletion"), model=models.AdministrativeAct, - access_controls=["change_administrativeact"], + access_controls=[ + "archaeological_operations.change_administrativeact" + ], ), ], ), @@ -112,8 +132,8 @@ MENU_SECTIONS = [ pgettext_lazy("admin act register", "Register"), model=models.AdministrativeAct, access_controls=[ - "view_administrativeact", - "view_own_administrativeact", + "archaeological_operations.view_administrativeact", + "archaeological_operations.view_own_administrativeact", ], ), ], @@ -132,8 +152,8 @@ MENU_SECTIONS = [ _("Search"), model=models.ArchaeologicalSite, access_controls=[ - "view_archaeologicalsite", - "view_own_archaeologicalsite", + "archaeological_operations.view_archaeologicalsite", + "archaeological_operations.view_own_archaeologicalsite", ], ), MenuItem( @@ -141,8 +161,8 @@ MENU_SECTIONS = [ _("Creation"), model=models.ArchaeologicalSite, access_controls=[ - "add_archaeologicalsite", - "add_own_archaeologicalsite", + "archaeological_operations.add_archaeologicalsite", + "archaeological_operations.add_own_archaeologicalsite", ], ), MenuItem( @@ -150,15 +170,17 @@ MENU_SECTIONS = [ _("Modification"), model=models.ArchaeologicalSite, access_controls=[ - "change_archaeologicalsite", - "change_own_archaeologicalsite", + "archaeological_operations.change_archaeologicalsite", + "archaeological_operations.change_own_archaeologicalsite", ], ), MenuItem( "site_deletion", _("Deletion"), model=models.ArchaeologicalSite, - access_controls=["change_archaeologicalsite"], + access_controls=[ + "archaeological_operations.change_archaeologicalsite" + ], ), ], ), -- cgit v1.2.3