1 files changed, 36 insertions, 14 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 464076caf..1863ba450 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -925,14 +925,18 @@ WEIGHT_UNIT = (
 class FindBasket(Basket, MainItem, ValueGetter):
     SHOW_URL = "show-findbasket"
     SLUG = "findbasket"
-    items = models.ManyToManyField("Find", blank=True, related_name="basket", verbose_name=_("Associated finds"))
+    items = models.ManyToManyField("Find", blank=True, related_name="basket",
+                                   verbose_name=_("Associated finds"))
 
     QA_EDIT = QuickAction(
         url="findbasket-qa-bulk-update",
         icon_class="fa fa-pencil",
         text=_("Modify"),
         target="many",
-        rights=["view_find", "view_own_find"],
+        rights=[
+            "archaeological_finds.view_find",
+            "archaeological_finds.view_own_find"
+        ],
     )
     QUICK_ACTIONS = [
         QA_EDIT,
@@ -941,7 +945,10 @@ class FindBasket(Basket, MainItem, ValueGetter):
             icon_class="fa fa-clone",
             text=_("Duplicate"),
             target="one",
-            rights=["view_find", "view_own_find"],
+            rights=[
+                "archaeological_finds.view_find",
+                "archaeological_finds.view_own_find"
+            ],
         ),
     ]
 
@@ -976,7 +983,7 @@ class FindBasket(Basket, MainItem, ValueGetter):
         """
         # url, base_text, icon, extra_text, extra css class, is a quick action
 
-        if not request.user or not request.user.ishtaruser:
+        if not request.user or not getattr(request.user, "ishtaruser", None):
             return []
 
         ishtaruser = request.user.ishtaruser
@@ -994,7 +1001,7 @@ class FindBasket(Basket, MainItem, ValueGetter):
                     False,
                 ),
             ]
-        can_edit_find = self.can_do(request, "change_find")
+        can_edit_find = self.can_do(request, "archaeological_finds.change_find")
         if can_edit_find:
             actions += [
                 (
@@ -1006,7 +1013,7 @@ class FindBasket(Basket, MainItem, ValueGetter):
                     False,
                 ),
             ]
-        if self.can_do(request, "add_treatmentfile"):
+        if self.can_do(request, "archaeological_finds.add_treatmentfile"):
             actions += [
                 (
                     reverse("findbasket-add-treatmentfile", args=[self.pk]),
@@ -1857,14 +1864,16 @@ class Find(
         icon_class="fa fa-pencil",
         text=_("Bulk update"),
         target="many",
-        rights=["change_find", "change_own_find"],
+        rights=["archaeological_finds.change_find",
+                "archaeological_finds.change_own_find"],
     )
     QA_LOCK = QuickAction(
         url="find-qa-lock",
         icon_class="fa fa-lock",
         text=_("Lock/Unlock"),
         target="many",
-        rights=["change_find", "change_own_find"],
+        rights=["archaeological_finds.change_find",
+                "archaeological_finds.change_own_find"],
     )
 
     QUICK_ACTIONS = [
@@ -1874,21 +1883,30 @@ class Find(
             icon_class="fa fa-clone",
             text=_("Duplicate"),
             target="one",
-            rights=["change_find", "change_own_find"],
+            rights=[
+                "archaeological_finds.change_find",
+                "archaeological_finds.change_own_find"
+            ],
         ),
         QuickAction(
             url="find-qa-basket",
             icon_class="fa fa-shopping-basket",
             text=_("Basket"),
             target="many",
-            rights=["change_find", "change_own_find"],
+            rights=[
+                "archaeological_finds.change_find",
+                "archaeological_finds.change_own_find"
+            ],
         ),
         QuickAction(
             url="find-qa-packaging",
             icon_class="fa fa-gift",
             text=_("Packaging"),
             target="many",
-            rights=["change_find", "change_own_find"],
+            rights=[
+                "archaeological_finds.change_find",
+                "archaeological_finds.change_own_find"
+            ],
             module="warehouse",
         ),
         QuickAction(
@@ -1896,7 +1914,10 @@ class Find(
             icon_class="fa fa-object-group",
             text=_("Treatment many to one"),
             target="many",
-            rights=["change_find", "change_own_find"],
+            rights=[
+                "archaeological_finds.change_find",
+                "archaeological_finds.change_own_find"
+            ],
             is_popup=False,
         ),
         QA_LOCK,
@@ -2641,11 +2662,12 @@ class Find(
 
         is_locked = hasattr(self, "is_locked") and self.is_locked(request.user)
         profile = get_current_profile()
-        can_add_geo = profile.mapping and self.can_do(request, "add_geovectordata")
+        can_add_geo = profile.mapping and self.can_do(request,
+                                                      "ishtar_common.add_geovectordata")
         if can_add_geo:
             if self.base_finds.count() == 1:
                 actions.append(self.base_finds.all()[0].get_add_geo_action())
-        can_edit_find = self.can_do(request, "change_find")
+        can_edit_find = self.can_do(request, "archaeological_finds.change_find")
         if can_edit_find and not is_locked:
             actions += [
                 (