From 490e9a1e4239faeb2261928a27f958e6b458a8b0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 14 Jan 2015 15:58:04 -0400 Subject: [PATCH] Remove value field from the document metadata remove form to avoid running validation on remove and blocking removal when validation didn't pass --- mayan/apps/metadata/forms.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mayan/apps/metadata/forms.py b/mayan/apps/metadata/forms.py index dc0bdbe79f..0267700030 100644 --- a/mayan/apps/metadata/forms.py +++ b/mayan/apps/metadata/forms.py @@ -68,17 +68,21 @@ MetadataFormSet = formset_factory(MetadataForm, extra=0) class AddMetadataForm(forms.Form): + metadata_type = forms.ModelChoiceField(queryset=MetadataType.objects.all(), label=_(u'Metadata type')) + 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() - metadata_type = forms.ModelChoiceField(queryset=MetadataType.objects.all(), label=_(u'Metadata type')) - class MetadataRemoveForm(MetadataForm): update = forms.BooleanField(initial=False, label=_(u'Remove'), required=False) + def __init__(self, *args, **kwargs): + super(MetadataRemoveForm, self).__init__(*args, **kwargs) + self.fields.pop('value') + MetadataRemoveFormSet = formset_factory(MetadataRemoveForm, extra=0)