From bcf57a6741430bd81c36c6b37d3ad99cf195c72a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 12 Sep 2017 15:07:35 +0200 Subject: Simplify multimedia and picture forms --- chimere/forms.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/chimere/forms.py b/chimere/forms.py index fe0dc9c..b484118 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -687,14 +687,7 @@ class MultimediaFileForm(BaseFileForm): class Meta: model = MultimediaFile - exclude = ('order',) - - def __init__(self, *args, **kwargs): - super(MultimediaFileForm, self).__init__(*args, **kwargs) - self.fields['multimedia_type'].widget.choices = \ - MultimediaType.get_tuples() - # this can be auto detect - self.fields['multimedia_type'].required = False + exclude = ('order', 'miniature', 'multimedia_type') MultimediaFileFormSet = formset_factory(MultimediaFileForm, can_delete=True) @@ -720,7 +713,7 @@ class PictureFileForm(BaseFileForm): class Meta: model = PictureFile exclude = ('order', 'height', 'width', 'thumbnailfile', - 'thumbnailfile_height', 'thumbnailfile_width') + 'thumbnailfile_height', 'thumbnailfile_width', 'miniature') PictureFileFormSet = formset_factory(PictureFileForm, can_delete=True) -- cgit v1.2.3