Ticket #3268: models.diff

models.py

@@ -4 +4 @@
 """
 
 from forms import BaseForm, DeclarativeFieldsMetaclass, SortedDictFromList
+from fields import ChoiceField
+from django.utils.text import capfirst
 
 __all__ = ('save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields')
 
@@ -56 +58 @@
     opts = model._meta
     field_list = []
     for f in opts.fields + opts.many_to_many:
-        formfield = f.formfield()
+        if f.choices:
+            formfield = ChoiceField(required=not f.blank, label=capfirst(f.verbose_name), choices=f.choices)
+        else:
+            formfield = f.formfield()
         if formfield:
             field_list.append((f.name, formfield))
     fields = SortedDictFromList(field_list)
@@ -73 +78 @@
     field_list = []
     for f in opts.fields + opts.many_to_many:
         current_value = f.value_from_object(instance)
-        formfield = f.formfield(initial=current_value)
+        if f.choices:
+            formfield = ChoiceField(required=not f.blank, label=capfirst(f.verbose_name), choices=f.choices, initial=current_value)
+        else:
+            formfield = f.formfield(initial=current_value)
         if formfield:
             field_list.append((f.name, formfield))
     fields = SortedDictFromList(field_list)