From d91fed40cacf333ebe8c49c43dc3fcd68019edde Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 28 Feb 2013 03:29:25 -0400 Subject: [PATCH] Backport fix for default value failure in metadata types with lookup values --- apps/metadata/forms.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/metadata/forms.py b/apps/metadata/forms.py index c2e281242c..61a17e60ed 100644 --- a/apps/metadata/forms.py +++ b/apps/metadata/forms.py @@ -32,11 +32,6 @@ class MetadataForm(forms.Form): self.fields['name'].initial = '%s%s' % ((self.metadata_type.title if self.metadata_type.title else self.metadata_type.name), required_string) self.fields['id'].initial = self.metadata_type.pk - if self.metadata_type.default: - try: - self.fields['value'].initial = eval(self.metadata_type.default, AVAILABLE_FUNCTIONS) - except Exception, err: - self.fields['value'].initial = err if self.metadata_type.lookup: try: @@ -51,6 +46,12 @@ class MetadataForm(forms.Form): self.fields['value'].initial = err self.fields['value'].widget = forms.TextInput(attrs={'readonly': 'readonly'}) + if self.metadata_type.default: + try: + self.fields['value'].initial = eval(self.metadata_type.default, AVAILABLE_FUNCTIONS) + except Exception, err: + self.fields['value'].initial = err + id = forms.CharField(label=_(u'id'), widget=forms.HiddenInput) name = forms.CharField(label=_(u'Name'), required=False, widget=forms.TextInput(attrs={'readonly': 'readonly'}))