Ticket #9498: generic.py_helpers.py_r9329.diff

contrib/admin/helpers.py

@@ -150 +150 @@
         return AdminField(self.form, self.formset._pk_field.name, False)
     
     def fk_field(self):
-        return AdminField(self.form, self.formset.fk.name, False)
+        try:
+            return AdminField(self.form, self.formset.fk.name, False)
+        except KeyError, e:
+            return ""
 
     def deletion_field(self):
         from django.forms.formsets import DELETION_FIELD_NAME

contrib/contenttypes/generic.py

@@ -355 +355 @@
                                    fields=fields, exclude=exclude, max_num=max_num)
     FormSet.ct_field = ct_field
     FormSet.ct_fk_field = fk_field
+    FormSet.fk = fk_field
     return FormSet
 
 class GenericInlineModelAdmin(InlineModelAdmin):