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

Edited metadata api to allow switchable creation of new document metadata

Browse Source
This commit is contained in:
Roberto Rosario
2011-05-11 21:01:06 -04:00
parent c91d05bff7
commit 5a0ae2eb32
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documents/views.py
View File

@@ -122,7 +122,7 @@ def _handle_save_document(request, document, form=None):
document.file_filename = form.cleaned_data['document_type_available_filenames'].filename
document.save()
save_metadata_list(decode_metadata_from_url(request.GET), document)
save_metadata_list(decode_metadata_from_url(request.GET), document, create=True)
try:
warnings = document_create_fs_links(document)
if request.user.is_staff or request.user.is_superuser:

39
apps/metadata/api.py
View File

@@ -32,12 +32,12 @@ def decode_metadata_from_url(url_dict):
return metadata_list
def save_metadata_list(metadata_list, document):
def save_metadata_list(metadata_list, document, create=False):
"""
Take a list of metadata values and associate a document to it
"""
for item in metadata_list:
save_metadata(item, document)
save_metadata(item, document, create)
#if item['value']:
# save_metadata(item, document)
@@ -55,24 +55,25 @@ def save_metadata_list(metadata_list, document):
# pass
def save_metadata(metadata_dict, document):
def save_metadata(metadata_dict, document, create=False):
"""save metadata_dict"""
# Use matched metadata now to create document metadata
#document_metadata, created = DocumentMetadata.objects.get_or_create(
# document=document,
# metadata_type=get_object_or_404(
# MetadataType,
# pk=metadata_dict['id']
# ),
#)
document_metadata = DocumentMetadata.objects.get(
document=document,
metadata_type=get_object_or_404(
MetadataType,
pk=metadata_dict['id']
),
)
if create:
# Use matched metadata now to create document metadata
document_metadata, created = DocumentMetadata.objects.get_or_create(
document=document,
metadata_type=get_object_or_404(
MetadataType,
pk=metadata_dict['id']
),
)
else:
document_metadata = DocumentMetadata.objects.get(
document=document,
metadata_type=get_object_or_404(
MetadataType,
pk=metadata_dict['id']
),
)
# Handle 'plus sign as space' in the url