Issue #88, remove metadata type selection step from interactive upload wizard

Max wizard steps is now 2. Second step is skiped when document type
has not associated metadata types.
This commit is contained in:
Roberto Rosario
2014-10-21 19:02:31 -04:00
parent 0a55b4c16a
commit ce39a775ee
3 changed files with 27 additions and 44 deletions

View File

@@ -80,24 +80,6 @@ class MetadataRemoveForm(MetadataForm):
update = forms.BooleanField(initial=False, label=_(u'Remove'), required=False)
class MetadataSelectionForm(forms.Form):
def __init__(self, *args, **kwargs):
super(MetadataSelectionForm, self).__init__(*args, **kwargs)
document_type = getattr(self, 'initial', {}).get('document_type', None)
if document_type:
try:
defaults = document_type.documenttypedefaults_set.get()
self.fields['metadata_types'].initial = defaults.default_metadata.all()
except DocumentTypeDefaults.DoesNotExist:
pass
metadata_types = forms.ModelMultipleChoiceField(
queryset=MetadataType.objects.all(),
label=_(u'Metadata'),
required=False,
widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
)
MetadataRemoveFormSet = formset_factory(MetadataRemoveForm, extra=0)