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

Add new document upload wizard step to attach tags. GitLab issue #208.

Browse Source
This commit is contained in:
Roberto Rosario
2016-02-05 03:25:27 -04:00
parent 74d8f1d994
commit 652613452b
7 changed files with 104 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mayan/apps/sources/tasks.py
View File

@@ -35,7 +35,7 @@ def task_check_interval_source(source_id):
@app.task(bind=True, default_retry_delay=DEFAULT_SOURCE_TASK_RETRY_DELAY, ignore_result=True)
def task_upload_document(self, source_id, document_type_id, shared_uploaded_file_id, description=None, label=None, language=None, metadata_dict_list=None, user_id=None):
def task_upload_document(self, source_id, document_type_id, shared_uploaded_file_id, description=None, label=None, language=None, metadata_dict_list=None, tag_ids=None, user_id=None):
SharedUploadedFile = apps.get_model(
app_label='common', model_name='SharedUploadedFile'
)
@@ -64,7 +64,8 @@ def task_upload_document(self, source_id, document_type_id, shared_uploaded_file
source.upload_document(
file_object=file_object, document_type=document_type,
description=description, label=label, language=language,
metadata_dict_list=metadata_dict_list, user=user
metadata_dict_list=metadata_dict_list, user=user,
tag_ids=tag_ids
)
except OperationalError as exception:
@@ -85,7 +86,7 @@ def task_upload_document(self, source_id, document_type_id, shared_uploaded_file
@app.task(bind=True, default_retry_delay=DEFAULT_SOURCE_TASK_RETRY_DELAY, ignore_result=True)
def task_source_handle_upload(self, document_type_id, shared_uploaded_file_id, source_id, description=None, expand=False, label=None, language=None, metadata_dict_list=None, skip_list=None, user_id=None):
def task_source_handle_upload(self, document_type_id, shared_uploaded_file_id, source_id, description=None, expand=False, label=None, language=None, metadata_dict_list=None, skip_list=None, tag_ids=None, user_id=None):
SharedUploadedFile = apps.get_model(
app_label='common', model_name='SharedUploadedFile'
)
@@ -114,7 +115,7 @@ def task_source_handle_upload(self, document_type_id, shared_uploaded_file_id, s
'description': description, 'document_type_id': document_type.pk,
'label': label, 'language': language,
'metadata_dict_list': metadata_dict_list,
'source_id': source_id, 'user_id': user_id
'source_id': source_id, 'tag_ids': tag_ids, 'user_id': user_id
}
if not skip_list:
@@ -147,7 +148,8 @@ def task_source_handle_upload(self, document_type_id, shared_uploaded_file_id, s
expand=expand, label=label,
language=language,
metadata_dict_list=metadata_dict_list,
skip_list=skip_list, user_id=user_id
skip_list=skip_list, tag_ids=tag_ids,
user_id=user_id
)
return
else: