♻ permissions refactoring: refactor has_permission methods

1 files changed, 10 insertions, 10 deletions

diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 44ba75947..0d3f978b5 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -24,7 +24,7 @@ from django.db.models import Q, F
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.forms.formsets import formset_factory
 from django.views.generic.edit import UpdateView
-from django.shortcuts import redirect, render
+from django.shortcuts import redirect
 from django.urls import reverse
 from ishtar_common.utils import ugettext_lazy as _
 
@@ -56,18 +56,18 @@ from archaeological_operations.forms import FinalAdministrativeActDeleteForm
 from ishtar_common.forms import ClosingDateFormSelection
 from . import forms, models
 
-from archaeological_operations.models import Operation, AdministrativeAct
+from archaeological_operations.models import AdministrativeAct
 
 RE_YEAR_INDEX = re.compile(r"([1-2][0-9]{3})-([0-9]+)")  # eg.: 2014-123
 
 
 def autocomplete_file(request):
+    ishtaruser = getattr(request.user, "ishtaruser", None)
+    if not ishtaruser:
+        return HttpResponse(content_type="text/plain")
     if (
-        not request.user.has_perm("ishtar_common.view_file", models.File)
-        and not request.user.has_perm("ishtar_common.view_own_file", models.File)
-        and not request.user.ishtaruser.has_right(
-            "file_search", session=request.session
-        )
+        not ishtaruser.has_permission("archaeological_files.view_file")
+        and not ishtaruser.has_permission("archaeological_files.view_own_file")
     ):
         return HttpResponse(content_type="text/plain")
     if not request.GET.get("term"):
@@ -103,9 +103,9 @@ revert_file = revert_item(models.File)
 
 def extra_file_dct(request, item):
     dct = {}
-    if request.user.has_perm(
-        "ishtar_common.add_operation", Operation
-    ) or request.user.ishtaruser.has_right("add_operation"):
+    if request.user.ishtaruser.has_permission(
+            "archaeological_operations.add_operation"
+    ):
         dct["can_add_operation"] = True
     return dct