Merge pull request #22 from tienthienhd/feature/ocr-custom
Feature/ocr custom
This commit is contained in:
commit
a54bab5bce
@ -484,9 +484,10 @@ def get_permissions_criterias(user: Optional[User] = None):
|
|||||||
if user is not None:
|
if user is not None:
|
||||||
if user.is_superuser: # superusers see all docs
|
if user.is_superuser: # superusers see all docs
|
||||||
user_criterias = []
|
user_criterias = []
|
||||||
else:
|
# else:
|
||||||
user_criterias.append(query.Term("owner_id", user.id))
|
# user_criterias.append(query.Term("owner_id", user.id))
|
||||||
user_criterias.append(
|
# user_criterias.append(
|
||||||
query.Term("viewer_id", str(user.id)),
|
# query.Term("viewer_id", str(user.id)),
|
||||||
)
|
# )
|
||||||
|
user_criterias = []
|
||||||
return user_criterias
|
return user_criterias
|
||||||
|
@ -562,12 +562,18 @@ class DocumentViewSet(
|
|||||||
def thumb(self, request, pk=None):
|
def thumb(self, request, pk=None):
|
||||||
try:
|
try:
|
||||||
doc = Document.objects.get(id=pk)
|
doc = Document.objects.get(id=pk)
|
||||||
if request.user is not None and not has_perms_owner_aware(
|
# Allow all users to view thumbnails
|
||||||
request.user,
|
if request.user is None:
|
||||||
"view_document",
|
|
||||||
doc,
|
|
||||||
):
|
|
||||||
return HttpResponseForbidden("Insufficient permissions")
|
return HttpResponseForbidden("Insufficient permissions")
|
||||||
|
|
||||||
|
# Original
|
||||||
|
# if request.user is not None and not has_perms_owner_aware(
|
||||||
|
# request.user,
|
||||||
|
# "view_document",
|
||||||
|
# doc,
|
||||||
|
# ):
|
||||||
|
# return HttpResponseForbidden("Insufficient permissions")
|
||||||
|
|
||||||
if doc.storage_type == Document.STORAGE_TYPE_GPG:
|
if doc.storage_type == Document.STORAGE_TYPE_GPG:
|
||||||
handle = GnuPG.decrypted(doc.thumbnail_file)
|
handle = GnuPG.decrypted(doc.thumbnail_file)
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user