Ticket #5358: 5358_fk_name_fix.diff

django/newforms/models.py

@@ -319 +319 @@
         fks_to_parent = [f for f in opts.fields if isinstance(f, ForeignKey) and f.rel.to == parent_model]
         if len(fks_to_parent) == 1:
             fk = fks_to_parent[0]
+            fk_name = fk.name
         elif len(fks_to_parent) == 0:
             raise Exception("%s has no ForeignKey to %s" % (model, parent_model))
         else:
             raise Exception("%s has more than 1 ForeignKey to %s" % (model, parent_model))
+    else:
+        fk = [f for f in opts.fields if f.name == fk_name][0]
     # let the formset handle object deletion by default
     FormSet = formset_for_model(model, formset=InlineFormset, fields=fields, 
                                 formfield_callback=formfield_callback,