🐛 fix administrative act permissions

5 files changed, 58 insertions, 25 deletions

diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py
index 8645be2f2..ecb27aa2b 100644
--- a/archaeological_files/ishtar_menu.py
+++ b/archaeological_files/ishtar_menu.py
@@ -86,7 +86,8 @@ MENU_SECTIONS = [
                             _("Search"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.change_administrativeact"
+                                "archaeological_operations.view_administrativeact",
+                                "archaeological_operations.view_own_administrativeact",
                             ],
                         ),
                         MenuItem(
@@ -94,7 +95,7 @@ MENU_SECTIONS = [
                             _("Creation"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.change_administrativeact"
+                                "archaeological_operations.add_administrativeact"
                             ],
                         ),
                         MenuItem(
@@ -102,7 +103,8 @@ MENU_SECTIONS = [
                             _("Modification"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.change_administrativeact"
+                                "archaeological_operations.change_administrativeact",
+                                "archaeological_operations.change_own_administrativeact"
                             ],
                         ),
                         MenuItem(
@@ -111,6 +113,7 @@ MENU_SECTIONS = [
                             model=AdministrativeAct,
                             access_controls=[
                                 "archaeological_operations.delete_administrativeact"
+                                "archaeological_operations.delete_own_administrativeact"
                             ],
                         ),
                     ],
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py
index d8e473451..42c48a3d7 100644
--- a/archaeological_files/urls.py
+++ b/archaeological_files/urls.py
@@ -37,14 +37,17 @@ urlpatterns = [
     ),
     url(
         r"file_administrativeactfile_search/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.view_administrativeact",
+            "archaeological_operations.view_own_administrativeact"])(
             views.file_administrativeactfile_search_wizard
         ),
         name="file_administrativeactfile_search",
     ),
     url(
         r"^file_administrativeactfile/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.add_administrativeact"])(
             views.file_administrativeactfile_wizard
         ),
         name="file_administrativeactfile",
@@ -56,14 +59,18 @@ urlpatterns = [
     ),
     url(
         r"file_administrativeactfile_deletion/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.delete_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.delete_administrativeact",
+            "archaeological_operations.delete_own_administrativeact"])(
             views.file_administrativeactfile_deletion_wizard
         ),
         name="file_administrativeactfile_deletion",
     ),
     url(
         r"file_administrativeactfile_modification/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.change_administrativeact",
+            "archaeological_operations.change_own_administrativeact"])(
             views.file_administrativeactfile_modification_wizard
         ),
         name="file_administrativeactfile_modification",
diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py
index 70f0dcfc7..3fd01e00d 100644
--- a/archaeological_finds/ishtar_menu.py
+++ b/archaeological_finds/ishtar_menu.py
@@ -151,8 +151,7 @@ MENU_SECTIONS = [
                     _("Creation"),
                     model=models.TreatmentFile,
                     access_controls=[
-                        "archaeological_finds.change_treatmentfile",
-                        "archaeological_finds.change_own_treatmentfile",
+                        "archaeological_finds.add_treatmentfile",
                     ],
                 ),
                 MenuItem(
@@ -182,7 +181,8 @@ MENU_SECTIONS = [
                             _("Search"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.view_administrativeact"
+                                "archaeological_operations.view_administrativeact",
+                                "archaeological_operations.view_own_administrativeact"
                             ],
                         ),
                         MenuItem(
@@ -190,7 +190,7 @@ MENU_SECTIONS = [
                             _("Creation"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.change_administrativeact"
+                                "archaeological_operations.add_administrativeact"
                             ],
                         ),
                         MenuItem(
@@ -198,7 +198,8 @@ MENU_SECTIONS = [
                             _("Modification"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.change_administrativeact"
+                                "archaeological_operations.change_administrativeact",
+                                "archaeological_operations.change_own_administrativeact"
                             ],
                         ),
                         MenuItem(
@@ -206,7 +207,8 @@ MENU_SECTIONS = [
                             _("Deletion"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.change_administrativeact"
+                                "archaeological_operations.delete_administrativeact",
+                                "archaeological_operations.delete_own_administrativeact"
                             ],
                         ),
                     ],
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 38675ecdb..688fe5da3 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -345,21 +345,27 @@ urlpatterns = [
     ),
     url(
         r"^treatment_admacttreatment_search/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.view_administrativeact",
+            "archaeological_operations.view_own_administrativeact"])(
             views.treatment_administrativeact_search_wizard
         ),
         name="treatment_admacttreatment_search",
     ),
     url(
         r"^treatment_admacttreatment/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.add_administrativeact"])(
             views.treatment_administrativeact_wizard
         ),
         name="treatment_admacttreatment",
     ),
     url(
         r"^treatment_admacttreatment_modification/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.change_administrativeact",
+            "archaeological_operations.change_own_administrativeact",
+            ])(
             views.treatment_administrativeact_modification_wizard
         ),
         name="treatment_admacttreatment_modification",
@@ -371,7 +377,9 @@ urlpatterns = [
     ),
     url(
         r"^treatment_admacttreatment_deletion/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.delete_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.delete_administrativeact",
+            "archaeological_operations.delete_own_administrativeact"])(
             views.treatment_admacttreatment_deletion_wizard
         ),
         name="treatment_admacttreatment_deletion",
@@ -388,21 +396,26 @@ urlpatterns = [
     ),
     url(
         r"^treatmentfle_admacttreatmentfle_search/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.view_administrativeact",
+            "archaeological_operations.view_own_administrativeact",
+            ])(
             views.treatmentfile_admacttreatmentfile_search_wizard
         ),
         name="treatmentfle_admacttreatmentfle_search",
     ),
     url(
         r"^treatmentfle_admacttreatmentfle_modification/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.change_administrativeact",
+            "archaeological_operations.change_own_administrativeact"])(
             views.treatmentfile_admacttreatmentfile_modification_wizard
         ),
         name="treatmentfle_admacttreatmentfle_modification",
     ),
     url(
         r"^treatmentfle_admacttreatmentfle/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions(["archaeological_operations.add_administrativeact"])(
             views.treatmentfile_admacttreatmentfile_wizard
         ),
         name="treatmentfle_admacttreatmentfle",
@@ -414,7 +427,9 @@ urlpatterns = [
     ),
     url(
         r"^treatmentfle_admacttreatmentfle_deletion/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.delete_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.delete_administrativeact",
+            "archaeological_operations.delete_own_administrativeact"])(
             views.treatmentfile_admacttreatmentfile_deletion_wizard
         ),
         name="treatmentfle_admacttreatmentfle_deletion",
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py
index 6868679cc..13b9d6dff 100644
--- a/archaeological_operations/urls.py
+++ b/archaeological_operations/urls.py
@@ -36,21 +36,25 @@ register_converter(urls_converters.UnderscoreSlug, "uslug")
 urlpatterns = [
     url(
         r"operation_administrativeactop_search/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.view_administrativeact",
+            "archaeological_operations.view_own_administrativeact"])(
             views.operation_administrativeactop_search_wizard
         ),
         name="operation_administrativeactop_search",
     ),
     url(
         r"operation_administrativeactop/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions(["archaeological_operations.add_administrativeact"])(
             views.operation_administrativeactop_wizard
         ),
         name="operation_administrativeactop",
     ),
     url(
         r"operation_administrativeactop_modification/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.change_administrativeact",
+            "archaeological_operations.change_own_administrativeact"])(
             views.operation_administrativeactop_modification_wizard
         ),
         name="operation_administrativeactop_modification",
@@ -62,7 +66,9 @@ urlpatterns = [
     ),
     url(
         r"operation_administrativeactop_deletion/(?P<step>.+)?$",
-        check_permissions(["archaeological_operations.change_administrativeact"])(
+        check_permissions([
+            "archaeological_operations.delete_administrativeact",
+            "archaeological_operations.delete_own_administrativeact"])(
             views.operation_administrativeactop_deletion_wizard
         ),
         name="operation_administrativeactop_deletion",