mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #9498 -- Handle a formset correctly when the foreign key is not available (for now).

Browse Source 
This case pops up with generic foreign key inlines after [9297]. Added tests
to handle future regressions with generic foreign key inlines in the admin.

Thanks markus and danielr for patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner
2008-11-13 19:03:44 +00:00
parent dfa90aec1b
commit f751d5b713
8 changed files with 140 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/admin/helpers.py
View File

@@ -108,8 +108,9 @@ class InlineAdminFormSet(object):
yield InlineAdminForm(self.formset, form, self.fieldsets, self.opts.prepopulated_fields, None)
def fields(self):
fk = getattr(self.formset, "fk", None)
for field_name in flatten_fieldsets(self.fieldsets):
if self.formset.fk.name == field_name:
if fk and fk.name == field_name:
continue
yield self.formset.form.base_fields[field_name]
@@ -150,7 +151,11 @@ class InlineAdminForm(AdminForm):
return AdminField(self.form, self.formset._pk_field.name, False)
def fk_field(self):
return AdminField(self.form, self.formset.fk.name, False)
fk = getattr(self.formset, "fk", None)
if fk:
return AdminField(self.form, fk.name, False)
else:
return ""
def deletion_field(self):
from django.forms.formsets import DELETION_FIELD_NAME
@@ -166,8 +171,9 @@ class InlineFieldset(Fieldset):
super(InlineFieldset, self).__init__(*args, **kwargs)
def __iter__(self):
fk = getattr(self.formset, "fk", None)
for field in self.fields:
if self.formset.fk.name == field:
if fk and fk.name == field:
continue
yield Fieldline(self.form, field)