paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-09 09:58:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Jonas Winkler 2020-11-13 22:41:51 +01:00
commit 45533209a8
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -10,7 +10,7 @@ COPY src-ui/package* ./
RUN npm install RUN npm install
COPY src-ui . COPY src-ui .
RUN node_modules/.bin/ng build --prod --output-hashing none --sourceMap=false RUN node_modules/.bin/ng build --prod --output-hashing none --sourceMap=false --output-path dist/paperless-ui
############################################################################### ###############################################################################
### Back end ### ### Back end ###

20
src/documents/views.py
View File

@ -1,5 +1,5 @@
from django.db.models import Count, Max from django.db.models import Count, Max
from django.http import HttpResponse, HttpResponseBadRequest from django.http import HttpResponse, HttpResponseBadRequest, Http404
from django.views.decorators.cache import cache_control from django.views.decorators.cache import cache_control
from django.views.generic import TemplateView from django.views.generic import TemplateView
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
@ -140,17 +140,27 @@ class DocumentViewSet(RetrieveModelMixin,
@action(methods=['get'], detail=True) @action(methods=['get'], detail=True)
def preview(self, request, pk=None): def preview(self, request, pk=None):
response = self.file_response(pk, "inline") try:
return response response = self.file_response(pk, "inline")
return response
except FileNotFoundError:
raise Http404("Document source file does not exist")
@action(methods=['get'], detail=True) @action(methods=['get'], detail=True)
@cache_control(public=False, max_age=315360000) @cache_control(public=False, max_age=315360000)
def thumb(self, request, pk=None): def thumb(self, request, pk=None):
return HttpResponse(Document.objects.get(id=pk).thumbnail_file, content_type='image/png') try:
return HttpResponse(Document.objects.get(id=pk).thumbnail_file, content_type='image/png')
except FileNotFoundError:
raise Http404("Document thumbnail does not exist")
@action(methods=['get'], detail=True) @action(methods=['get'], detail=True)
def download(self, request, pk=None): def download(self, request, pk=None):
return self.file_response(pk, "attachment") try:
return self.file_response(pk, "attachment")
except FileNotFoundError:
raise Http404("Document source file does not exist")
class LogViewSet(ReadOnlyModelViewSet): class LogViewSet(ReadOnlyModelViewSet):