Ticket #494: 494.7.patch

django/django/forms/formsets.py

@@ -302 +302 @@
         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)

django/django/forms/models.py

@@ -675 +675 @@
         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):
     """
@@ -684 +684 @@
     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
 
@@ -811 +812 @@
 
 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()):
     """
@@ -834 +835 @@
         'fields': fields,
         'exclude': exclude,
         'max_num': max_num,
+        'classes': classes,
     }
     FormSet = modelformset_factory(model, **kwargs)
     FormSet.fk = fk

django/django/contrib/admin/media/js/admin/CollapsedFieldsets.js

@@ -11 +11 @@
 }
 
 var CollapsedFieldsets = {
-    collapse_re: /\bcollapse\b/,   // Class of fieldsets that should be dealt with.
-    collapsed_re: /\bcollapsed\b/, // Class that fieldsets get when they're hidden.
+    collapse_re: /\bcollapse\b/g,   // Class of fieldsets that should be dealt with.
+    collapsed_re: /\bcollapsed\b/g, // Class that fieldsets get when they're hidden.
     collapsed_class: 'collapsed',
     init: function() {
         var fieldsets = document.getElementsByTagName('fieldset');

django/django/contrib/admin/options.py

@@ -1109 +1109 @@
     template = None
     verbose_name = None
     verbose_name_plural = None
+    classes = []
 
     def __init__(self, parent_model, admin_site):
         self.admin_site = admin_site
@@ -1125 +1126 @@
         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 +1154 @@
             "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)

django/django/contrib/admin/templates/admin/edit_inline/stacked.html

@@ -1 +1 @@
 {% load i18n %}
 <div class="inline-group">
+<fieldset class="module {% for class in inline_admin_formset.formset.classes %}{{class}}{% endfor %}">
   <h2>{{ inline_admin_formset.opts.verbose_name_plural|title }}</h2>
 {{ inline_admin_formset.formset.management_form }}
 {{ inline_admin_formset.formset.non_form_errors }}
@@ -25 +26 @@
 {# <ul class="tools"> #}
 {#   <li><a class="add" href="">Add another {{ inline_admin_formset.opts.verbose_name|title }}</a></li> #}
 {# </ul> #}
+</fieldset>
 </div>

django/django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -2 +2 @@
 <div class="inline-group">
   <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
 {{ inline_admin_formset.formset.management_form }}
-<fieldset class="module">
+<fieldset class="module {% for class in inline_admin_formset.formset.classes %}{{class}}{% endfor %}">
    <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
    {{ inline_admin_formset.formset.non_form_errors }}
    <table>

django/django/contrib/contenttypes/generic.py

@@ -337 +337 @@
 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 +362 @@
         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
@@ -390 +390 @@
             "can_order": False,
             "fields": fields,
             "max_num": self.max_num,
-            "exclude": self.exclude
+            "exclude": self.exclude,
+            "classes": self.classes,
         }
         return generic_inlineformset_factory(self.model, **defaults)
 

django/docs/ref/contrib/admin/index.txt

@@ -915 +915 @@
 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
 ---------------------------------------------------------------------------