From 5050c7319c00a07484a029f1492841588fd22796 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 8 Dec 2014 18:33:57 -0400 Subject: [PATCH] Remove preemptive document metadata selection --- mayan/apps/metadata/__init__.py | 6 ------ mayan/apps/metadata/models.py | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/mayan/apps/metadata/__init__.py b/mayan/apps/metadata/__init__.py index 9415557c75..78431432b6 100644 --- a/mayan/apps/metadata/__init__.py +++ b/mayan/apps/metadata/__init__.py @@ -46,13 +46,7 @@ def post_post_document_type_change_metadata(sender, instance, **kwargs): DocumentMetadata.objects.create(document=instance, metadata_type=metadata_type, value=None) -@property -def document_metadata(document): - return document.document_metadata.select_related('metadata_type') - - DocumentType.add_to_class('metadata_type', DocumentTypeMetadataTypeHelper.constructor) -Document.add_to_class('metadata', document_metadata) Document.add_to_class('metadata_value_of', DocumentMetadataHelper.constructor) register_links(['metadata:metadata_add', 'metadata:metadata_edit', 'metadata:metadata_remove', 'metadata:metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar') diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py index 38d8c53214..b74909e1fb 100644 --- a/mayan/apps/metadata/models.py +++ b/mayan/apps/metadata/models.py @@ -45,7 +45,7 @@ class DocumentMetadata(models.Model): Link a document to a specific instance of a metadata type with it's current value """ - document = models.ForeignKey(Document, verbose_name=_(u'Document'), related_name='document_metadata') + document = models.ForeignKey(Document, verbose_name=_(u'Document'), related_name='metadata') metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'Type')) value = models.CharField(max_length=255, blank=True, null=True, verbose_name=_(u'Value'), db_index=True)