From f5093a3d3b30c7187139fd6f5295e0883b3f79cd Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 8 Dec 2014 23:36:36 -0400 Subject: [PATCH] Update document type metadata access --- mayan/apps/sources/wizards.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mayan/apps/sources/wizards.py b/mayan/apps/sources/wizards.py index 9f168a1ddc..cc7dfbb5ce 100644 --- a/mayan/apps/sources/wizards.py +++ b/mayan/apps/sources/wizards.py @@ -25,7 +25,7 @@ class DocumentCreateWizard(MayanPermissionCheckMixin, SessionWizardView): def _has_metadata_types(wizard): # Skip the 2nd step if document type has no associated metadata try: - return wizard.get_cleaned_data_for_step('0')['document_type'].metadata_type.all().count() + return wizard.get_cleaned_data_for_step('0')['document_type'].metadata.all().count() except TypeError: return False @@ -49,15 +49,10 @@ class DocumentCreateWizard(MayanPermissionCheckMixin, SessionWizardView): if step == '1': initial = [] - for metadata_type in self.get_cleaned_data_for_step('0')['document_type'].metadata_type.filter(required=True): + for document_type_metadata_type in self.get_cleaned_data_for_step('0')['document_type'].metadata.all(): initial.append({ - 'metadata_type': metadata_type, - 'required': True, - }) - - for metadata_type in self.get_cleaned_data_for_step('0')['document_type'].metadata_type.filter(required=False): - initial.append({ - 'metadata_type': metadata_type, + 'metadata_type': document_type_metadata_type.metadata_type, + 'required': document_type_metadata_type.required, }) return initial