♻ permissions refactoring: refactor has_permission methods

1 files changed, 59 insertions, 45 deletions

diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index a41852b8b..669732a57 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -20,19 +20,20 @@
 from django.conf.urls import url
 from django.urls import path
 
-from ishtar_common.utils import check_rights
+from ishtar_common.utils import check_permissions
 
 from archaeological_warehouse import models, views, views_api
 
-# be careful: each check_rights must be relevant with ishtar_menu
+# be careful: each check_permissions must be relevant with ishtar_menu
 
 # forms
 urlpatterns = [
     url(
         r"warehouse_packaging/(?P<step>.+)?$",  # AFAC
-        check_rights(["change_find", "change_own_find"])(
-            views.warehouse_packaging_wizard
-        ),
+        check_permissions(
+            ["archaeological_finds.change_find",
+             "archaeological_finds.change_own_find"]
+        )(views.warehouse_packaging_wizard),
         name="warehouse_packaging",
     ),
     url(
@@ -105,19 +106,24 @@ urlpatterns = [
     ),
     url(
         r"^warehouse_search/(?P<step>.+)?$",
-        check_rights(["view_warehouse", "view_own_warehouse"])(
-            views.warehouse_search_wizard
-        ),
+        check_permissions(
+            ["archaeological_warehouse.view_warehouse",
+             "archaeological_warehouse.view_own_warehouse"]
+        )(views.warehouse_search_wizard),
         name="warehouse_search",
     ),
     url(
         r"^warehouse_creation/(?P<step>.+)?$",
-        check_rights(["add_warehouse"])(views.warehouse_creation_wizard),
+        check_permissions(
+            ["archaeological_warehouse.add_warehouse"]
+        )(views.warehouse_creation_wizard),
         name="warehouse_creation",
     ),
     url(
         r"^warehouse_modification/(?P<step>.+)?$",
-        check_rights(["change_warehouse"])(views.warehouse_modification_wizard),
+        check_permissions(
+            ["archaeological_warehouse.change_warehouse"]
+        )(views.warehouse_modification_wizard),
         name="warehouse_modification",
     ),
     url(
@@ -127,7 +133,9 @@ urlpatterns = [
     ),
     url(
         r"^warehouse_deletion/(?P<step>.+)?$",
-        check_rights(["change_warehouse"])(views.warehouse_deletion_wizard),
+        check_permissions(
+            ["archaeological_warehouse.change_warehouse"]
+        )(views.warehouse_deletion_wizard),
         name="warehouse_deletion",
     ),
     url(
@@ -143,49 +151,51 @@ urlpatterns = [
     ),
     url(
         r"^warehouse-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
-        check_rights([
-            "change_warehouse",
-            "change_own_warehouse"
-        ])(
-            views.QAWarehouseForm.as_view()
-        ),
+        check_permissions([
+            "archaeological_warehouse.change_warehouse",
+            "archaeological_warehouse.change_own_warehouse"
+        ])(views.QAWarehouseForm.as_view()),
         name="warehouse-qa-bulk-update",
     ),
     url(
         r"^warehouse-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
-        check_rights([
-            "change_warehouse",
-            "change_own_warehouse",
-        ])(
-            views.QAWarehouseForm.as_view()
-        ),
+        check_permissions([
+            "archaeological_warehouse.change_warehouse",
+            "archaeological_warehouse.change_own_warehouse",
+        ])(views.QAWarehouseForm.as_view()),
         name="warehouse-qa-bulk-update-confirm",
         kwargs={"confirm": True},
     ),
     url(
         r"^container-add-treatment/(?P<pk>[0-9-]+)/$",
-        check_rights(["change_find", "change_own_find"])(views.container_treatment_add),
+        check_permissions(
+            ["archaeological_finds.change_find",
+             "archaeological_finds.change_own_find"]
+        )(views.container_treatment_add),
         name="container-add-treatment",
     ),
     url(
         r"^container_search/(?P<step>.+)?$",
-        check_rights(["view_container", "view_own_container"])(
-            views.container_search_wizard
-        ),
+        check_permissions(
+            ["archaeological_warehouse.view_container",
+             "archaeological_warehouse.view_own_container"]
+        )(views.container_search_wizard),
         name="container_search",
     ),
     url(
         r"^container_creation/(?P<step>.+)?$",
-        check_rights(["add_container", "add_own_container"])(
-            views.container_creation_wizard
-        ),
+        check_permissions(
+            ["archaeological_warehouse.add_container",
+             "archaeological_warehouse.add_own_container"]
+        )(views.container_creation_wizard),
         name="container_creation",
     ),
     url(
         r"^container_modification/(?P<step>.+)?$",
-        check_rights(["change_container", "change_own_container"])(
-            views.container_modification_wizard
-        ),
+        check_permissions(
+            ["archaeological_warehouse.change_container",
+             "archaeological_warehouse.change_own_container"]
+        )(views.container_modification_wizard),
         name="container_modification",
     ),
     url(
@@ -195,9 +205,10 @@ urlpatterns = [
     ),
     url(
         r"^container_deletion/(?P<step>.+)?$",
-        check_rights(["change_container", "change_own_container"])(
-            views.container_deletion_wizard
-        ),
+        check_permissions(
+            ["archaeological_warehouse.change_container",
+             "archaeological_warehouse.change_own_container"]
+        )(views.container_deletion_wizard),
         name="container_deletion",
     ),
     url(
@@ -207,24 +218,27 @@ urlpatterns = [
     ),
     url(
         r"^container-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
-        check_rights(["change_container", "change_own_container"])(
-            views.QAContainerForm.as_view()
-        ),
+        check_permissions(
+            ["archaeological_warehouse.change_container",
+             "archaeological_warehouse.change_own_container"]
+        )(views.QAContainerForm.as_view()),
         name="container-qa-bulk-update",
     ),
     url(
         r"^container-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
-        check_rights(["change_container", "change_own_container"])(
-            views.QAContainerForm.as_view()
-        ),
+        check_permissions(
+            ["archaeological_warehouse.change_container",
+             "archaeological_warehouse.change_own_container"]
+        )(views.QAContainerForm.as_view()),
         name="container-qa-bulk-update-confirm",
         kwargs={"confirm": True},
     ),
     url(
         r"^container-qa-move/(?P<pks>[0-9-]+)?/$",
-        check_rights(["change_container", "change_own_container"])(
-            views.QAContainerMoveForm.as_view()
-        ),
+        check_permissions(
+            ["archaeological_warehouse.change_container",
+             "archaeological_warehouse.change_own_container"]
+        )(views.QAContainerMoveForm.as_view()),
         name="container-qa-move",
     ),
     url(