From 064d67746b206be778e0d387fd55b0516f753a27 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 15 Feb 2011 22:00:49 -0400 Subject: [PATCH] Delete document metadata if left blank on dataentry --- apps/documents/utils.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/documents/utils.py b/apps/documents/utils.py index 4e33154e6d..8fc3bec579 100755 --- a/apps/documents/utils.py +++ b/apps/documents/utils.py @@ -3,6 +3,7 @@ import tempfile from urllib import unquote_plus from django.shortcuts import get_object_or_404 +from django.core.exceptions import ObjectDoesNotExist from documents import TEMPORARY_DIRECTORY @@ -87,8 +88,17 @@ def decode_metadata_from_url(url_dict): def save_metadata_list(metadata_list, document): for item in metadata_list: - save_metadata(item, document) - + if item['value']: + save_metadata(item, document) + else: + try: + metadata_type = MetadataType.objects.get(id=item['id']) + document_metadata = DocumentMetadata.objects.get(document=document, + metadata_type=metadata_type) + document_metadata.delete() + except ObjectDoesNotExist: + pass + def save_metadata(metadata_dict, document): #Use matched metadata now to create document metadata