From 704abb705973d9a6583c07ced4d5bb6acb710574 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 8 Dec 2014 18:37:54 -0400 Subject: [PATCH] Use related_name 'metadata' to access document types' metadata types --- mayan/apps/metadata/classes.py | 2 +- mayan/apps/metadata/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mayan/apps/metadata/classes.py b/mayan/apps/metadata/classes.py index a2d43ed365..34ab5c1ac3 100644 --- a/mayan/apps/metadata/classes.py +++ b/mayan/apps/metadata/classes.py @@ -21,7 +21,7 @@ class DocumentTypeMetadataTypeHelper(object): def get_query_set(self, **kwargs): try: - return MetadataType.objects.filter(pk__in=self.instance.documenttypemetadatatype_set.filter(**kwargs).values_list('metadata_type', flat=True)) + return MetadataType.objects.filter(pk__in=self.instance.metadata.filter(**kwargs).values_list('metadata_type', flat=True)) except MetadataType.DoesNotExist: return MetadataType.objects.none() diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py index b74909e1fb..ed820f5a00 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='metadata') + document = models.ForeignKey(Document, related_name='metadata', verbose_name=_(u'Document')) 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) @@ -71,7 +71,7 @@ class DocumentMetadata(models.Model): class DocumentTypeMetadataType(models.Model): - document_type = models.ForeignKey(DocumentType, verbose_name=_(u'Document type')) + document_type = models.ForeignKey(DocumentType, related_name='metadata', verbose_name=_(u'Document type')) metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'Metadata type')) required = models.BooleanField(default=False, verbose_name=_('Required'))