🐛 menus: fix many permissions to add/moddify (refs #6118, #6115, #6110)

7 files changed, 49 insertions, 48 deletions

diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py
index ecb27aa2b..37126039f 100644
--- a/archaeological_files/ishtar_menu.py
+++ b/archaeological_files/ishtar_menu.py
@@ -66,7 +66,10 @@ MENU_SECTIONS = [
                     "file_closing",
                     _("Closing"),
                     model=models.File,
-                    access_controls=["archaeological_files.close_file"],
+                    access_controls=[
+                        "archaeological_files.change_file",
+                        "archaeological_files.change_own_file"
+                    ],
                 ),
                 MenuItem(
                     "file_deletion",
@@ -112,7 +115,7 @@ MENU_SECTIONS = [
                             _("Deletion"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.delete_administrativeact"
+                                "archaeological_operations.delete_administrativeact",
                                 "archaeological_operations.delete_own_administrativeact"
                             ],
                         ),
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py
index 42c48a3d7..b30c5b95d 100644
--- a/archaeological_files/urls.py
+++ b/archaeological_files/urls.py
@@ -103,9 +103,10 @@ urlpatterns = [
     url(r"^file_modify/(?P<pk>.+)/$", views.file_modify, name="file_modify"),
     url(
         r"^file_closing/(?P<step>.+)?$",
-        check_permissions(
-            ["archaeological_files.change_file"]
-        )(views.file_closing_wizard),
+        check_permissions(["archaeological_files.change_file",
+                           "archaeological_files.change_own_file"])(
+            views.file_closing_wizard
+        ),
         name="file_closing",
     ),
     url(
diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py
index 0326932e6..02bf06ef5 100644
--- a/archaeological_finds/ishtar_menu.py
+++ b/archaeological_finds/ishtar_menu.py
@@ -66,8 +66,8 @@ MENU_SECTIONS = [
                     _("Deletion"),
                     model=models.Find,
                     access_controls=[
-                        "archaeological_finds.change_find",
-                        "archaeological_finds.change_own_find"
+                        "archaeological_finds.delete_find",
+                        "archaeological_finds.delete_own_find"
                     ],
                 ),
                 SectionItem(
@@ -178,8 +178,8 @@ MENU_SECTIONS = [
                     _("Deletion"),
                     model=models.TreatmentFile,
                     access_controls=[
-                        "archaeological_finds.change_treatmentfile",
-                        "archaeological_finds.change_own_treatmentfile",
+                        "archaeological_finds.delete_treatmentfile",
+                        "archaeological_finds.delete_own_treatmentfile",
                     ],
                 ),
                 SectionItem(
@@ -248,16 +248,15 @@ MENU_SECTIONS = [
                     _("Simple treatment - creation"),
                     model=models.Treatment,
                     access_controls=[
-                        "archaeological_finds.change_find",
-                        "archaeological_finds.change_own_find"],
+                        "archaeological_finds.add_treatment",
+                    ],
                 ),
                 MenuItem(
                     "treatment_creation_n1",
                     _("Treatment many to one - creation"),
                     model=models.Treatment,
                     access_controls=[
-                        "archaeological_finds.change_find",
-                        "archaeological_finds.change_own_find"
+                        "archaeological_finds.add_treatment",
                     ],
                 ),
                 MenuItem(
@@ -265,8 +264,7 @@ MENU_SECTIONS = [
                     _("Treatment one to many - creation"),
                     model=models.Treatment,
                     access_controls=[
-                        "archaeological_finds.change_find",
-                        "archaeological_finds.change_own_find"
+                        "archaeological_finds.add_treatment",
                     ],
                 ),
                 MenuItem(
@@ -283,8 +281,8 @@ MENU_SECTIONS = [
                     _("Deletion"),
                     model=models.Treatment,
                     access_controls=[
-                        "archaeological_finds.change_treatment",
-                        "archaeological_finds.change_own_treatment"
+                        "archaeological_finds.delete_treatment",
+                        "archaeological_finds.delete_own_treatment"
                     ],
                 ),
                 SectionItem(
@@ -313,6 +311,7 @@ MENU_SECTIONS = [
                             model=AdministrativeAct,
                             access_controls=[
                                 "archaeological_operations.change_administrativeact"
+                                "archaeological_operations.change_own_administrativeact"
                             ],
                         ),
                         MenuItem(
@@ -320,7 +319,7 @@ MENU_SECTIONS = [
                             _("Deletion"),
                             model=AdministrativeAct,
                             access_controls=[
-                                "archaeological_operations.change_administrativeact"
+                                "archaeological_operations.delete_administrativeact"
                             ],
                         ),
                     ],
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 6e6f6ff0a..ef47bbe5c 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -171,8 +171,7 @@ urlpatterns = [
     url(
         r"^findbasket-add-treatment/(?P<pk>[0-9-]+)/$",
         check_permissions(
-            ["archaeological_finds.change_find",
-             "archaeological_finds.change_own_find"]
+            ["archaeological_finds.add_treatment"]
         )(views.findbasket_treatment_add),
         name="findbasket-add-treatment",
     ),
@@ -186,24 +185,21 @@ urlpatterns = [
     url(
         r"^find-add-treatment/(?P<pk>[0-9-]+)/$",
         check_permissions(
-            ["archaeological_finds.change_find",
-             "archaeological_finds.change_own_find"]
+            ["archaeological_finds.add_treatment"]
         )(views.find_treatment_add),
         name="find-add-treatment",
     ),
     url(
         r"^find-add-divide-treatment/(?P<pk>[0-9-]+)/$",
         check_permissions(
-            ["archaeological_finds.change_find",
-             "archaeological_finds.change_own_find"]
+            ["archaeological_finds.add_treatment"]
         )(views.find_divide_treatment_add),
         name="find-add-divide-treatment",
     ),
     url(
         r"^treatmentfile-add-treatment/(?P<pk>[0-9-]+)/$",
         check_permissions(
-            ["archaeological_finds.change_find",
-             "archaeological_finds.change_own_find"]
+            ["archaeological_finds.add_treatment"]
         )(views.treatmentfile_treatment_add),
         name="treatmentfile-add-treatment",
     ),
@@ -286,16 +282,14 @@ urlpatterns = [
     url(
         r"^treatment_creation/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_finds.change_find",
-             "archaeological_finds.change_own_find"]
+            ["archaeological_finds.add_treatment"]
             )(views.treatment_creation_wizard),
         name="treatment_creation",
     ),
     url(
         r"^treatment_creation_n1/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_finds.change_find",
-             "archaeological_finds.change_own_find"]
+            ["archaeological_finds.add_treatment"]
         )(views.treatment_creation_n1_wizard),
         name="treatment_creation_n1",
     ),
@@ -307,16 +301,15 @@ urlpatterns = [
     url(
         r"^treatment_creation_1n/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_finds.change_find",
-             "archaeological_finds.change_own_find"]
+            ["archaeological_finds.add_treatment"]
         )(views.treatment_creation_1n_wizard),
         name="treatment_creation_1n",
     ),
     url(
         r"^treatment_modification/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_finds.change_find",
-             "archaeological_finds.change_own_find"]
+            ["archaeological_finds.change_treatment",
+             "archaeological_finds.change_own_treatment"]
         )(views.treatment_modification_wizard),
         name="treatment_modification",
     ),
@@ -328,16 +321,16 @@ urlpatterns = [
     url(
         r"^treatment_search/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_finds.view_find",
-             "archaeological_finds.view_own_find"]
+            ["archaeological_finds.view_treatment",
+             "archaeological_finds.view_own_treatment"]
         )(views.treatment_search_wizard),
         name="treatment_search",
     ),
     url(
         r"^treatment_deletion/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_finds.delete_treatmentfile",
-             "archaeological_finds.delete_own_treatmentfile"]
+            ["archaeological_finds.delete_treatment",
+             "archaeological_finds.delete_own_treatment"]
         )(views.treatment_deletion_wizard),
         name="treatment_deletion",
     ),
@@ -512,8 +505,7 @@ urlpatterns = [
     url(
         r"treatmentfle_creation/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_finds.change_treatmentfile",
-             "archaeological_finds.change_own_treatmentfile"]
+            ["archaeological_finds.add_treatmentfile"]
         )(views.treatmentfile_creation_wizard),
         name="treatmentfile_creation",
     ),
@@ -533,8 +525,8 @@ urlpatterns = [
     url(
         r"^treatmentfle_deletion/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_finds.delete_find",
-             "archaeological_finds.delete_own_find"]
+            ["archaeological_finds.delete_treatmentfile",
+             "archaeological_finds.delete_own_treatmentfile"]
             )(views.treatmentfile_deletion_wizard),
         name="treatmentfile_deletion",
     ),
diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py
index 5cc0fec98..cd57c3334 100644
--- a/archaeological_operations/ishtar_menu.py
+++ b/archaeological_operations/ishtar_menu.py
@@ -65,7 +65,10 @@ MENU_SECTIONS = [
                     "operation_closing",
                     _("Closing"),
                     model=models.Operation,
-                    access_controls=["archaeological_operations.close_operation"],
+                    access_controls=[
+                        "archaeological_operations.change_operation",
+                        "archaeological_operations.change_own_operation"
+                    ],
                 ),
                 MenuItem(
                     "operation_deletion",
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py
index 13b9d6dff..3eda0f94e 100644
--- a/archaeological_operations/urls.py
+++ b/archaeological_operations/urls.py
@@ -117,7 +117,8 @@ urlpatterns = [
     url(
         r"operation_closing/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_operations.change_operation"]
+            ["archaeological_operations.change_operation",
+             "archaeological_operations.change_own_operation"]
         )(views.operation_closing_wizard),
         name="operation_closing",
     ),
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index e5128c81f..287379a44 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -123,7 +123,8 @@ urlpatterns = [
     url(
         r"^warehouse_modification/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_warehouse.change_warehouse"]
+            ["archaeological_warehouse.change_warehouse",
+             "archaeological_warehouse.change_own_warehouse"]
         )(views.warehouse_modification_wizard),
         name="warehouse_modification",
     ),
@@ -135,7 +136,8 @@ urlpatterns = [
     url(
         r"^warehouse_deletion/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_warehouse.change_warehouse"]
+            ["archaeological_warehouse.delete_warehouse",
+             "archaeological_warehouse.delete_own_warehouse"]
         )(views.warehouse_deletion_wizard),
         name="warehouse_deletion",
     ),
@@ -212,8 +214,8 @@ urlpatterns = [
     url(
         r"^container_deletion/(?P<step>.+)?$",
         check_permissions(
-            ["archaeological_warehouse.change_container",
-             "archaeological_warehouse.change_own_container"]
+            ["archaeological_warehouse.delete_container",
+             "archaeological_warehouse.delete_own_container"]
         )(views.container_deletion_wizard),
         name="container_deletion",
     ),