Ticket #9386: 03-attrs-templates-legends.diff

django/forms/fields.py

@@ -59 +59 @@
     creation_counter = 0
 
     def __init__(self, required=True, widget=None, label=None, initial=None,
-                 help_text=None, error_messages=None, show_hidden_initial=False):
+                 help_text=None, error_messages=None, show_hidden_initial=False,
+                 attrs=None, template=None):
         # required -- Boolean that specifies whether the field is required.
         #             True by default.
         # widget -- A Widget class, or instance of a Widget class, that should
@@ -93 +94 @@
             widget.attrs.update(extra_attrs)
 
         self.widget = widget
+        
+        self.attrs = attrs
+        self.template = template
 
         # Increase the creation counter, and save our local copy.
         self.creation_counter = Field.creation_counter

django/forms/forms.py

@@ -114 +114 @@
     # class, not to the Form class.
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList, label_suffix=':',
-                 empty_permitted=False):
+                 empty_permitted=False, attrs=None, template=None):
         self.is_bound = data is not None or files is not None
         self.data = data or {}
         self.files = files or {}
@@ -127 +127 @@
         self._is_valid = None # Stores validation state after full_clean() has been called.
         self._changed_data = None
 
+        self.attrs = attrs
+        self.template = template
+
         # The base_fields class attribute is the *class-wide* definition of
         # fields. Because a particular *instance* of the class might want to
         # alter self.fields, we create self.fields here by copying base_fields.
@@ -417 +420 @@
         else:
             self.label = self.field.label
         self.help_text = field.help_text or ''
+        self.attrs = field.attrs
+        self.template = field.template
 
     def __unicode__(self):
         """Renders this field as an HTML widget."""

django/forms/formsets.py

@@ -30 +30 @@
     A collection of instances of the same Form class.
     """
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
-                 initial=None, error_class=ErrorList):
+                 initial=None, error_class=ErrorList, attrs=None, template=None, legend=None):
         self.is_bound = data is not None or files is not None
         self.prefix = prefix or 'form'
         self.auto_id = auto_id
@@ -62 +62 @@
                        INITIAL_FORM_COUNT: self._initial_form_count}
             self.management_form = ManagementForm(initial=initial, auto_id=self.auto_id, prefix=self.prefix)
         
+        self.attrs = attrs
+        self.template = template
+        self.legend = legend
+        
         # construct the forms in the formset
         self._construct_forms()
 

django/forms/models.py

@@ -223 +223 @@
 class BaseModelForm(BaseForm):
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList, label_suffix=':',
-                 empty_permitted=False, instance=None):
+                 empty_permitted=False, instance=None, attrs=None, template=None):
         if instance is None:
             # if we didn't get an instance, instantiate a new one
             self.instance = self._meta.model()
@@ -235 +235 @@
         if initial is not None:
             object_data.update(initial)
         super(BaseModelForm, self).__init__(data, files, auto_id, prefix, object_data,
-                                            error_class, label_suffix, empty_permitted)
+                                            error_class, label_suffix, empty_permitted,
+                                            attrs, template)
     def clean(self):
         self.validate_unique()
         return self.cleaned_data
@@ -498 +499 @@
         self.save_as_new = save_as_new
         # is there a better way to get the object descriptor?
         self.rel_name = RelatedObject(self.fk.rel.to, self.model, self.fk).get_accessor_name()
-        super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix or self.rel_name)
+        kwargs = {}
+        for name in ('attrs', 'template', 'legend'):
+            kwargs[name] = getattr(self.__class__, name, None)
+        super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix or self.rel_name, **kwargs)
 
     def _construct_forms(self):
         if self.save_as_new:
@@ -571 +575 @@
                           formset=BaseInlineFormSet, fk_name=None,
                           fields=None, exclude=None, fieldsets=None, inlines=None, formfield_kwargs=None,
                           extra=3, can_order=False, can_delete=True, max_num=0,
-                          formfield_callback=lambda f, **kwargs: f.formfield(**kwargs)):
+                          formfield_callback=lambda f, **kwargs: f.formfield(**kwargs),
+                          attrs=None, template=None, legend=None):
     """
     Returns an ``InlineFormSet`` for the given kwargs.
 
@@ -603 +608 @@
     }
     FormSet = modelformset_factory(model, **kwargs)
     FormSet.fk = fk
+    FormSet.attrs = attrs
+    FormSet.template = template
+    FormSet.legend = legend
     return FormSet