From c93dd3812c53d21ab8517dc7af72e1d4b70a1b04 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
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_warehouse/ishtar_menu.py | 35 +++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'archaeological_warehouse/ishtar_menu.py')

diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py
index 851ec3643..c0b8d658b 100644
--- a/archaeological_warehouse/ishtar_menu.py
+++ b/archaeological_warehouse/ishtar_menu.py
@@ -23,7 +23,7 @@ from ishtar_common.menu_base import SectionItem, MenuItem
 
 from . 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,14 +39,17 @@ MENU_SECTIONS = [
                     "warehouse_search",
                     _("Search"),
                     model=models.Warehouse,
-                    access_controls=["view_warehouse", "view_own_warehouse"],
+                    access_controls=[
+                        "archaeological_warehouse.view_warehouse",
+                        "archaeological_warehouse.view_own_warehouse"
+                    ],
                 ),
                 MenuItem(
                     "warehouse_creation",
                     _("Creation"),
                     model=models.Warehouse,
                     access_controls=[
-                        "add_warehouse",
+                        "archaeological_warehouse.add_warehouse",
                     ],
                 ),
                 MenuItem(
@@ -54,7 +57,7 @@ MENU_SECTIONS = [
                     _("Modification"),
                     model=models.Warehouse,
                     access_controls=[
-                        "change_warehouse",
+                        "archaeological_warehouse.change_warehouse",
                     ],
                 ),
                 MenuItem(
@@ -62,7 +65,7 @@ MENU_SECTIONS = [
                     _("Deletion"),
                     model=models.Warehouse,
                     access_controls=[
-                        "change_warehouse",
+                        "archaeological_warehouse.change_warehouse",
                     ],
                 ),
             ],
@@ -80,42 +83,48 @@ MENU_SECTIONS = [
                     "container_search",
                     _("Search"),
                     model=models.Warehouse,
-                    access_controls=["view_container", "view_own_container"],
+                    access_controls=[
+                        "archaeological_warehouse.view_container",
+                        "archaeological_warehouse.view_own_container"
+                    ],
                 ),
                 MenuItem(
                     "container_creation",
                     _("Creation"),
                     model=models.Warehouse,
-                    access_controls=["add_container", "add_own_container"],
+                    access_controls=[
+                        "archaeological_warehouse.add_container",
+                        "archaeological_warehouse.add_own_container"
+                    ],
                 ),
                 MenuItem(
                     "container_modification",
                     _("Modification"),
                     model=models.Warehouse,
                     access_controls=[
-                        "change_container",
-                        "change_own_container",
+                        "archaeological_warehouse.change_container",
+                        "archaeological_warehouse.change_own_container",
                     ],
                 ),
                 MenuItem(
                     "container-merge",
                     _("Automatic merge"),
                     model=models.Container,
-                    access_controls=["administrator"],
+                    access_controls=["ishtaradmin"],
                 ),
                 MenuItem(
                     "container-manual-merge",
                     _("Manual merge"),
                     model=models.Container,
-                    access_controls=["administrator"],
+                    access_controls=["ishtaradmin"],
                 ),
                 MenuItem(
                     "container_deletion",
                     _("Deletion"),
                     model=models.Warehouse,
                     access_controls=[
-                        "change_container",
-                        "change_own_container",
+                        "archaeological_warehouse.change_container",
+                        "archaeological_warehouse.change_own_container",
                     ],
                 ),
             ],
-- 
cgit v1.2.3