♻ permissions refactoring: refactor has_permission methods

1 files changed, 10 insertions, 4 deletions

diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index b1e4e7ef4..22e23f3ca 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -257,9 +257,13 @@ class BaseImportForm(IshtarForm, forms.ModelForm):
         self._post_init()
 
     def _filter_importer_type_query(self, q, user):
-        if user.is_superuser or user.ishtaruser.has_right("add_import"):
+        ishtaruser = getattr(user, "ishtaruser", None)
+        if not ishtaruser:
+            self.fields["importer_type"].choices = [("", "--")]
+            return
+        if user.is_superuser or ishtaruser.has_permission("ishtar_common.add_import"):
             return q
-        if not user.ishtaruser.has_right("add_own_import"):
+        if not user.ishtaruser.has_permission("ishtar_common.add_own_import"):
             self.fields["importer_type"].choices = [("", "--")]
             return
         q = q.filter(users__pk=user.ishtaruser.pk)
@@ -555,10 +559,12 @@ class TargetKeyForm(forms.ModelForm):
         self.associated_import = None
         if instance and instance.pk:
             model = instance.target.associated_model
+            ishtaruser = getattr(self.user, "ishtaruser", None)
+            meta = model._meta
             if (
                 model
-                and self.user.has_perm(
-                    "{}.change_{}".format(model._meta.app_label, model._meta.model_name)
+                and ishtaruser.has_permission(
+                    f"{meta.app_label}.change_{meta.model_name}"
                 )
                 and hasattr(model, "admin_url")
             ):