Simplify multimedia and picture forms

1 files 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)