mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
newforms-admin: Allow a custom formset on InlineModelAdmin.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
07b82590d8
commit
c63faa1f49
@ -2,6 +2,7 @@ from django import oldforms, template
|
|||||||
from django import newforms as forms
|
from django import newforms as forms
|
||||||
from django.newforms.formsets import all_valid
|
from django.newforms.formsets import all_valid
|
||||||
from django.newforms.models import modelform_factory, inlineformset_factory
|
from django.newforms.models import modelform_factory, inlineformset_factory
|
||||||
|
from django.newforms.models import BaseInlineFormset
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.contrib.admin import widgets
|
from django.contrib.admin import widgets
|
||||||
from django.contrib.admin.util import get_deleted_objects
|
from django.contrib.admin.util import get_deleted_objects
|
||||||
@ -696,6 +697,7 @@ class InlineModelAdmin(BaseModelAdmin):
|
|||||||
"""
|
"""
|
||||||
model = None
|
model = None
|
||||||
fk_name = None
|
fk_name = None
|
||||||
|
formset = BaseInlineFormset
|
||||||
extra = 3
|
extra = 3
|
||||||
template = None
|
template = None
|
||||||
verbose_name = None
|
verbose_name = None
|
||||||
@ -717,7 +719,10 @@ class InlineModelAdmin(BaseModelAdmin):
|
|||||||
fields = flatten_fieldsets(self.declared_fieldsets)
|
fields = flatten_fieldsets(self.declared_fieldsets)
|
||||||
else:
|
else:
|
||||||
fields = None
|
fields = None
|
||||||
return inlineformset_factory(self.parent_model, self.model, form=self.form, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
|
return inlineformset_factory(self.parent_model, self.model,
|
||||||
|
form=self.form, formset=self.formset, fk_name=self.fk_name,
|
||||||
|
fields=fields, formfield_callback=self.formfield_for_dbfield,
|
||||||
|
extra=self.extra)
|
||||||
|
|
||||||
def get_fieldsets(self, request, obj=None):
|
def get_fieldsets(self, request, obj=None):
|
||||||
if self.declared_fieldsets:
|
if self.declared_fieldsets:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user