Merge pull request jschrewe#12 from jmbarbier/master

Jan Schrewe · Jan Schrewe · commit 1c138c097890 · 2012-08-06T07:36:10.000-07:00
Update FileField / ImageField defaults (required, help_text...)
diff --git a/mongodbforms/fieldgenerator.py b/mongodbforms/fieldgenerator.py
@@ -241,10 +241,25 @@ def generate_listfield(self, field, **kwargs):
             return f
 
     def generate_filefield(self, field, **kwargs):
-        return forms.FileField(**kwargs)
-    
+        defaults = {
+            'required':field.required,
+            'label':self.get_field_label(field),
+            'initial': field.default,
+            'help_text': self.get_field_help_text(field)
+        }
+        defaults.update(kwargs)
+        return forms.FileField(**defaults)
+
     def generate_imagefield(self, field, **kwargs):
-        return forms.ImageField(**kwargs)
+        defaults = {
+            'required':field.required,
+            'label':self.get_field_label(field),
+            'initial': field.default,
+            'help_text': self.get_field_help_text(field)
+        }
+        defaults.update(kwargs)
+        return forms.ImageField(**defaults)
+
 
 class MongoDefaultFormFieldGenerator(MongoFormFieldGenerator):
     """This class generates Django form-fields for mongoengine-fields."""
