From 6bf352ecbb8ae8b073dfc775d3211b5cacd29bf8 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 15 Mar 2016 18:39:48 -0400 Subject: [PATCH] Fix queryset assigment, should always be of MetadataType not DocumentTypeMetadataType, errors out on Postgres. --- mayan/apps/metadata/forms.py | 6 +++++- mayan/apps/metadata/views.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mayan/apps/metadata/forms.py b/mayan/apps/metadata/forms.py index 3d5365b3ea..d6a5a93cd6 100644 --- a/mayan/apps/metadata/forms.py +++ b/mayan/apps/metadata/forms.py @@ -101,7 +101,11 @@ class AddMetadataForm(forms.Form): def __init__(self, *args, **kwargs): document_type = kwargs.pop('document_type') super(AddMetadataForm, self).__init__(*args, **kwargs) - self.fields['metadata_type'].queryset = document_type.metadata.all() + self.fields['metadata_type'].queryset = MetadataType.objects.filter( + pk__in=document_type.metadata.values_list( + 'metadata_type', flat=True + ) + ) class MetadataTypeForm(forms.ModelForm): diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index cd0ee7dd44..62631129b0 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -243,7 +243,7 @@ def metadata_add(request, document_id=None, document_id_list=None): try: document_metadata, created = DocumentMetadata.objects.get_or_create( document=document, - metadata_type=metadata_type.metadata_type, + metadata_type=metadata_type, defaults={'value': ''} ) except Exception as exception: