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

2 files changed, 28 insertions, 37 deletions

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",
     ),