From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 16 Jan 2023 23:59:25 +0000 (-0800)
Subject: Merge branch 'dev' into feature-permissions
X-Git-Tag: v1.14.0-beta.rc1~109^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cfa5211e9840bd60aba1a17c90b5b5df6c66ee1;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'dev' into feature-permissions
---

0cfa5211e9840bd60aba1a17c90b5b5df6c66ee1
diff --cc src/documents/views.py
index fd0949fc10,6f0be21642..1bb5a50f08
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@@ -29,10 -30,8 +31,11 @@@ from django.utils.translation import ge
  from django.views.decorators.cache import cache_control
  from django.views.generic import TemplateView
  from django_filters.rest_framework import DjangoFilterBackend
 +from documents.filters import ObjectOwnedOrGrandtedPermissionsFilter
 +from documents.permissions import PaperlessAdminPermissions
 +from documents.permissions import PaperlessObjectPermissions
  from documents.tasks import consume_file
+ from langdetect import detect
  from packaging import version as packaging_version
  from paperless import version
  from paperless.db import GnuPG