Use cache for faster rights checking

2 files changed, 3 insertions, 2 deletions

diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 93cbdff13..16cd6df65 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -46,7 +46,7 @@ class FileType(GeneralType):
     def is_preventive(cls, file_type_id, key=''):
         key = key or 'preventive'
         try:
-            preventive = FileType.objects.get(txt_idx=key).pk
+            preventive = FileType.get_cache(key).pk
             return file_type_id == preventive
         except FileType.DoesNotExist:
             return False
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 3f7e0bc8b..ad6eff854 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -50,7 +50,8 @@ RE_YEAR_INDEX = re.compile(r"([1-2][0-9]{3})-([0-9]+)")  # eg.: 2014-123
 def autocomplete_file(request):
     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'):
+       and not request.user.ishtaruser.has_right('file_search',
+                                                 session=request.session):
         return HttpResponse(mimetype='text/plain')
     if not request.GET.get('term'):
         return HttpResponse(mimetype='text/plain')