♻ permissions refactoring: refactor has_permission methods

1 files changed, 94 insertions, 31 deletions

diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py
index aa658023d..6ca50182e 100644
--- a/archaeological_finds/ishtar_menu.py
+++ b/archaeological_finds/ishtar_menu.py
@@ -24,7 +24,7 @@ from ishtar_common.menu_base import SectionItem, MenuItem
 from archaeological_operations.models import AdministrativeAct
 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,25 +39,37 @@ MENU_SECTIONS = [
                     "find_search",
                     _("Search"),
                     model=models.Find,
-                    access_controls=["view_find", "view_own_find"],
+                    access_controls=[
+                        "archeological_finds.view_find",
+                        "archeological_finds.view_own_find"
+                    ],
                 ),
                 MenuItem(
                     "find_creation",
                     _("Creation"),
                     model=models.Find,
-                    access_controls=["add_find", "add_own_find"],
+                    access_controls=[
+                        "archeological_finds.add_find",
+                        "archeological_finds.add_own_find"
+                    ],
                 ),
                 MenuItem(
                     "find_modification",
                     _("Modification"),
                     model=models.Find,
-                    access_controls=["change_find", "change_own_find"],
+                    access_controls=[
+                        "archeological_finds.change_find",
+                        "archeological_finds.change_own_find"
+                    ],
                 ),
                 MenuItem(
                     "find_deletion",
                     _("Deletion"),
                     model=models.Find,
-                    access_controls=["change_find", "change_own_find"],
+                    access_controls=[
+                        "archeological_finds.change_find",
+                        "archeological_finds.change_own_find"
+                    ],
                 ),
                 SectionItem(
                     "find_basket",
@@ -67,31 +79,46 @@ MENU_SECTIONS = [
                             "find_basket_search",
                             _("Search"),
                             model=models.FindBasket,
-                            access_controls=["view_find", "view_own_find"],
+                            access_controls=[
+                                "archeological_finds.view_find",
+                                "archeological_finds.view_own_find"
+                            ],
                         ),
                         MenuItem(
                             "find_basket_creation",
                             _("Creation"),
                             model=models.FindBasket,
-                            access_controls=["view_find", "view_own_find"],
+                            access_controls=[
+                                "archeological_finds.view_find",
+                                "archeological_finds.view_own_find"
+                            ],
                         ),
                         MenuItem(
                             "find_basket_modification",
                             _("Modification"),
                             model=models.FindBasket,
-                            access_controls=["view_find", "view_own_find"],
+                            access_controls=[
+                                "archeological_finds.view_find",
+                                "archeological_finds.view_own_find"
+                            ],
                         ),
                         MenuItem(
                             "find_basket_modification_add",
                             _("Manage items"),
                             model=models.FindBasket,
-                            access_controls=["view_find", "view_own_find"],
+                            access_controls=[
+                                "archeological_finds.view_find",
+                                "archeological_finds.view_own_find"
+                            ],
                         ),
                         MenuItem(
                             "find_basket_deletion",
                             _("Deletion"),
                             model=models.FindBasket,
-                            access_controls=["view_find", "view_own_find"],
+                            access_controls=[
+                                "archeological_finds.view_find",
+                                "archeological_finds.view_own_find"
+                            ],
                         ),
                     ],
                 ),
@@ -115,15 +142,18 @@ MENU_SECTIONS = [
                     "treatmentfle_search",
                     _("Search"),
                     model=models.TreatmentFile,
-                    access_controls=["view_treatmentfile", "view_own_treatmentfile"],
+                    access_controls=[
+                        "archeological_finds.view_treatmentfile",
+                        "archeological_finds.view_own_treatmentfile"
+                    ],
                 ),
                 MenuItem(
                     "treatmentfle_creation",
                     _("Creation"),
                     model=models.TreatmentFile,
                     access_controls=[
-                        "change_treatmentfile",
-                        "change_own_treatmentfile",
+                        "archeological_finds.change_treatmentfile",
+                        "archeological_finds.change_own_treatmentfile",
                     ],
                 ),
                 MenuItem(
@@ -131,8 +161,8 @@ MENU_SECTIONS = [
                     _("Modification"),
                     model=models.TreatmentFile,
                     access_controls=[
-                        "change_treatmentfile",
-                        "change_own_treatmentfile",
+                        "archeological_finds.change_treatmentfile",
+                        "archeological_finds.change_own_treatmentfile",
                     ],
                 ),
                 MenuItem(
@@ -140,8 +170,8 @@ MENU_SECTIONS = [
                     _("Deletion"),
                     model=models.TreatmentFile,
                     access_controls=[
-                        "change_treatmentfile",
-                        "change_own_treatmentfile",
+                        "archeological_finds.change_treatmentfile",
+                        "archeological_finds.change_own_treatmentfile",
                     ],
                 ),
                 SectionItem(
@@ -152,25 +182,33 @@ MENU_SECTIONS = [
                             "treatmentfle_admacttreatmentfle_search",
                             _("Search"),
                             model=AdministrativeAct,
-                            access_controls=["change_administrativeact"],
+                            access_controls=[
+                                "archaeological_operations.view_administrativeact"
+                            ],
                         ),
                         MenuItem(
                             "treatmentfle_admacttreatmentfle",
                             _("Creation"),
                             model=AdministrativeAct,
-                            access_controls=["change_administrativeact"],
+                            access_controls=[
+                                "archaeological_operations.change_administrativeact"
+                            ],
                         ),
                         MenuItem(
                             "treatmentfle_admacttreatmentfle_modification",
                             _("Modification"),
                             model=AdministrativeAct,
-                            access_controls=["change_administrativeact"],
+                            access_controls=[
+                                "archaeological_operations.change_administrativeact"
+                            ],
                         ),
                         MenuItem(
                             "treatmentfle_admacttreatmentfle_deletion",
                             _("Deletion"),
                             model=AdministrativeAct,
-                            access_controls=["change_administrativeact"],
+                            access_controls=[
+                                "archaeological_operations.change_administrativeact"
+                            ],
                         ),
                     ],
                 ),
@@ -189,37 +227,54 @@ MENU_SECTIONS = [
                     "treatment_search",
                     _("Search"),
                     model=models.Treatment,
-                    access_controls=["view_treatment", "view_own_treatment"],
+                    access_controls=[
+                        "archaeological_finds.view_treatment",
+                        "archaeological_finds.view_own_treatment"
+                    ],
                 ),
                 MenuItem(
                     "treatment_creation",
                     _("Simple treatment - creation"),
                     model=models.Treatment,
-                    access_controls=["change_find", "change_own_find"],
+                    access_controls=[
+                        "archaeological_finds.change_find",
+                        "archaeological_finds.change_own_find"],
                 ),
                 MenuItem(
                     "treatment_creation_n1",
                     _("Treatment many to one - creation"),
                     model=models.Treatment,
-                    access_controls=["change_find", "change_own_find"],
+                    access_controls=[
+                        "archaeological_finds.change_find",
+                        "archaeological_finds.change_own_find"
+                    ],
                 ),
                 MenuItem(
                     "treatment_creation_1n",
                     _("Treatment one to many - creation"),
                     model=models.Treatment,
-                    access_controls=["change_find", "change_own_find"],
+                    access_controls=[
+                        "archaeological_finds.change_find",
+                        "archaeological_finds.change_own_find"
+                    ],
                 ),
                 MenuItem(
                     "treatment_modification",
                     _("Modification"),
                     model=models.Treatment,
-                    access_controls=["change_treatment", "change_own_treatment"],
+                    access_controls=[
+                        "archaeological_finds.change_treatment",
+                        "archaeological_finds.change_own_treatment"
+                    ],
                 ),
                 MenuItem(
                     "treatment_deletion",
                     _("Deletion"),
                     model=models.Treatment,
-                    access_controls=["change_treatment", "change_own_treatment"],
+                    access_controls=[
+                        "archaeological_finds.change_treatment",
+                        "archaeological_finds.change_own_treatment"
+                    ],
                 ),
                 SectionItem(
                     "admin_act_treatments",
@@ -229,25 +284,33 @@ MENU_SECTIONS = [
                             "treatment_admacttreatment_search",
                             _("Search"),
                             model=AdministrativeAct,
-                            access_controls=["view_administrativeact"],
+                            access_controls=[
+                                "archaeological_operations.view_administrativeact"
+                            ],
                         ),
                         MenuItem(
                             "treatment_admacttreatment",
                             _("Creation"),
                             model=AdministrativeAct,
-                            access_controls=["add_administrativeact"],
+                            access_controls=[
+                                "archaeological_operations.add_administrativeact"
+                            ],
                         ),
                         MenuItem(
                             "treatment_admacttreatment_modification",
                             _("Modification"),
                             model=AdministrativeAct,
-                            access_controls=["change_administrativeact"],
+                            access_controls=[
+                                "archaeological_operations.change_administrativeact"
+                            ],
                         ),
                         MenuItem(
                             "treatment_admacttreatment_deletion",
                             _("Deletion"),
                             model=AdministrativeAct,
-                            access_controls=["change_administrativeact"],
+                            access_controls=[
+                                "archaeological_operations.change_administrativeact"
+                            ],
                         ),
                     ],
                 ),