Don't set the default document label in the view, do it at the task level which is accesible always.

This commit is contained in:
Roberto Rosario
2015-07-08 01:00:32 -04:00
parent afafd45af9
commit 35b6ce5285
2 changed files with 5 additions and 1 deletions

View File

@@ -38,6 +38,9 @@ def task_source_upload_document(label, document_type_id, shared_uploaded_file_id
else:
user = None
if not label:
label = shared_uploaded_file.filename
with shared_uploaded_file.open() as file_object:
source.upload_document(description=description, document_type=document_type, expand=expand, file_object=file_object, label=label, language=language, metadata_dict_list=metadata_dict_list, user=user)

View File

@@ -215,10 +215,11 @@ class UploadInteractiveView(UploadBaseView):
shared_uploaded_file = SharedUploadedFile.objects.create(file=uploaded_file.file)
label = shared_uploaded_file.filename
if 'document_type_available_filenames' in forms['document_form'].cleaned_data:
if forms['document_form'].cleaned_data['document_type_available_filenames']:
label = forms['document_form'].cleaned_data['document_type_available_filenames'].filename
else:
label = None
if not self.request.user.is_anonymous():
user_id = self.request.user.pk