Ticket #3247: disable_formfield_for_hidden_fields_1.diff

django/newforms/models.py

@@ -45 +45 @@
     opts = model._meta
     field_list = []
     for f in opts.fields + opts.many_to_many:
-        formfield = f.formfield()
-        if formfield:
-            field_list.append((f.name, formfield))
+        if f.editable:
+            formfield = f.formfield()
+            if formfield:
+                field_list.append((f.name, formfield))
     fields = SortedDictFromList(field_list)
     return type(opts.object_name + 'Form', (form,), {'fields': fields, '_model': model, 'create': create})
 
@@ -61 +62 @@
     opts = model._meta
     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 formfield:
-            field_list.append((f.name, formfield))
+        if f.editable:
+            current_value = f.value_from_object(instance)
+            formfield = f.formfield(initial=current_value)
+            if formfield:
+                field_list.append((f.name, formfield))
     fields = SortedDictFromList(field_list)
     return type(opts.object_name + 'InstanceForm', (form,),
         {'fields': fields, '_model': model, 'apply_changes': make_apply_changes(opts, instance)})
 
 def form_for_fields(field_list):
     "Returns a Form class for the given list of Django database field instances."
-    fields = SortedDictFromList([(f.name, f.formfield()) for f in field_list])
+    fields = SortedDictFromList([(f.name, f.formfield()) for f in field_list if f.editable])
     return type('FormForFields', (BaseForm,), {'fields': fields})