matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix filename preservation during upload

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-09 14:18:59 -04:00
parent c2e35694d8
commit a4d1e66757
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/sources/api_views.py
View File

@@ -116,6 +116,7 @@ class APIDocumentCreateView(generics.CreateAPIView):
temporary_file.write(chunk) temporary_file.write(chunk)
temporary_file.close() temporary_file.close()
self.request.FILES['file'].close()
else: else:
return Response({ return Response({
'status': 'error', 'status': 'error',
@@ -129,7 +130,8 @@ class APIDocumentCreateView(generics.CreateAPIView):
task_upload_document.apply_async(kwargs=dict( task_upload_document.apply_async(kwargs=dict(
source_id=int(request.get('source')), source_id=int(request.get('source')),
file_path=temporary_file.name, filename=request.get('filename', None), file_path=temporary_file.name,
filename=request.get('filename', self.request.FILES['file'].name),
use_file_name=request.get('use_file_name', False), use_file_name=request.get('use_file_name', False),
document_type_id=int(request.get('document_type', 0)) or None, document_type_id=int(request.get('document_type', 0)) or None,
expand=request.get('expand', False), expand=request.get('expand', False),

4
mayan/apps/sources/views.py
View File

@@ -193,6 +193,7 @@ def upload_interactive(request, source_id=None, document_pk=None):
temporary_file.write(chunk) temporary_file.write(chunk)
temporary_file.close() temporary_file.close()
file_object.close()
if isinstance(source, StagingFolderSource): if isinstance(source, StagingFolderSource):
if source.delete_after_upload: if source.delete_after_upload:
@@ -205,7 +206,8 @@ def upload_interactive(request, source_id=None, document_pk=None):
task_upload_document.apply_async(kwargs=dict( task_upload_document.apply_async(kwargs=dict(
source_id=source.pk, source_id=source.pk,
file_path=temporary_file.name, filename=new_filename, file_path=temporary_file.name,
filename=new_filename or file_object.name,
use_file_name=form.cleaned_data.get('use_file_name', False), use_file_name=form.cleaned_data.get('use_file_name', False),
document_type_id=document_type_id, document_type_id=document_type_id,
expand=expand, expand=expand,