diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 7b3018e..a28f570 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1109,6 +1109,7 @@ class InlineModelAdmin(BaseModelAdmin): template = None verbose_name = None verbose_name_plural = None + classes = [] def __init__(self, parent_model, admin_site): self.admin_site = admin_site @@ -1125,6 +1126,8 @@ class InlineModelAdmin(BaseModelAdmin): js = [] if self.prepopulated_fields: js.append('js/urlify.js') + if 'collapse' in self.classes: + js.append('js/admin/CollapsedFieldsets.js') if self.filter_vertical or self.filter_horizontal: js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js']) return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js]) @@ -1151,6 +1154,7 @@ class InlineModelAdmin(BaseModelAdmin): "formfield_callback": curry(self.formfield_for_dbfield, request=request), "extra": self.extra, "max_num": self.max_num, + "classes": self.classes, } defaults.update(kwargs) return inlineformset_factory(self.parent_model, self.model, **defaults) diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html index 494c351..eb2885a 100644 --- a/django/contrib/admin/templates/admin/edit_inline/stacked.html +++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html @@ -1,5 +1,6 @@ {% load i18n %}
+

{{ inline_admin_formset.opts.verbose_name_plural|title }}

{{ inline_admin_formset.formset.management_form }} {{ inline_admin_formset.formset.non_form_errors }} @@ -25,4 +26,5 @@ {# #} +
diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html index ecc14a4..04a6e4f 100644 --- a/django/contrib/admin/templates/admin/edit_inline/tabular.html +++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html @@ -2,7 +2,7 @@
{{ inline_admin_formset.formset.management_form }} -
+

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

{{ inline_admin_formset.formset.non_form_errors }} diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 5564548..00cf6f4 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -337,7 +337,7 @@ class BaseGenericInlineFormSet(BaseModelFormSet): def generic_inlineformset_factory(model, form=ModelForm, formset=BaseGenericInlineFormSet, ct_field="content_type", fk_field="object_id", - fields=None, exclude=None, + fields=None, exclude=None, classes=[], extra=3, can_order=False, can_delete=True, max_num=0, formfield_callback=lambda f: f.formfield()): @@ -362,7 +362,7 @@ def generic_inlineformset_factory(model, form=ModelForm, exclude = [ct_field.name, fk_field.name] FormSet = modelformset_factory(model, form=form, formfield_callback=formfield_callback, - formset=formset, + formset=formset, classes=classes, extra=extra, can_delete=can_delete, can_order=can_order, fields=fields, exclude=exclude, max_num=max_num) FormSet.ct_field = ct_field diff --git a/django/forms/formsets.py b/django/forms/formsets.py index bb8e310..96a1e03 100644 --- a/django/forms/formsets.py +++ b/django/forms/formsets.py @@ -302,9 +302,9 @@ class BaseFormSet(StrAndUnicode): return mark_safe(u'\n'.join([unicode(self.management_form), forms])) def formset_factory(form, formset=BaseFormSet, extra=1, can_order=False, - can_delete=False, max_num=0): + can_delete=False, max_num=0, classes=[]): """Return a FormSet for the given form class.""" - attrs = {'form': form, 'extra': extra, + attrs = {'form': form, 'extra': extra, 'classes': classes, 'can_order': can_order, 'can_delete': can_delete, 'max_num': max_num} return type(form.__name__ + 'FormSet', (formset,), attrs) diff --git a/django/forms/models.py b/django/forms/models.py index 86eecee..5585ace 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -576,7 +576,7 @@ class BaseModelFormSet(BaseFormSet): super(BaseModelFormSet, self).add_fields(form, index) def modelformset_factory(model, form=ModelForm, formfield_callback=lambda f: f.formfield(), - formset=BaseModelFormSet, + formset=BaseModelFormSet, classes=[], extra=1, can_delete=False, can_order=False, max_num=0, fields=None, exclude=None): """ @@ -585,7 +585,8 @@ def modelformset_factory(model, form=ModelForm, formfield_callback=lambda f: f.f form = modelform_factory(model, form=form, fields=fields, exclude=exclude, formfield_callback=formfield_callback) FormSet = formset_factory(form, formset, extra=extra, max_num=max_num, - can_order=can_order, can_delete=can_delete) + can_order=can_order, can_delete=can_delete, + classes=classes) FormSet.model = model return FormSet @@ -694,7 +695,7 @@ def _get_foreign_key(parent_model, model, fk_name=None): def inlineformset_factory(parent_model, model, form=ModelForm, formset=BaseInlineFormSet, fk_name=None, - fields=None, exclude=None, + fields=None, exclude=None, classes=[], extra=3, can_order=False, can_delete=True, max_num=0, formfield_callback=lambda f: f.formfield()): """ @@ -717,6 +718,7 @@ def inlineformset_factory(parent_model, model, form=ModelForm, 'fields': fields, 'exclude': exclude, 'max_num': max_num, + 'classes': classes, } FormSet = modelformset_factory(model, **kwargs) FormSet.fk = fk diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index 700303f..99d7918 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -915,6 +915,21 @@ An override to the ``verbose_name`` found in the model's inner ``Meta`` class. An override to the ``verbose_name_plural`` found in the model's inner ``Meta`` class. +``classes`` +~~~~~~~~~~~ + +.. versionadded:: development + +A list containing extra CSS classes to apply to the inline. + +Example:: + + class BookInline(admin.TabularInline): + classes = ['collapse', 'extrapretty'] + +A useful class is ``collapse``, which will cause the inline to be initially +collapsed. + Working with a model with two or more foreign keys to the same parent model ---------------------------------------------------------------------------