Ticket #4727: newforms-admin-base-form.diff

django/contrib/admin/options.py

@@ -129 +129 @@
     filter_vertical = ()
     filter_horizontal = ()
     prepopulated_fields = {}
+    base_form = forms.BaseForm
 
     def __init__(self):
         # TODO: This should really go in django.core.validation, but validation
@@ -424 +425 @@
             post_url = '../../../'
 
         fields = flatten_fieldsets(self.fieldsets_add(request))
-        ModelForm = forms.form_for_model(model, fields=fields, formfield_callback=self.formfield_for_dbfield)
+        ModelForm = forms.form_for_model(model, fields=fields, form=self.base_form, formfield_callback=self.formfield_for_dbfield)
 
         inline_formsets = []
         if request.method == 'POST':
@@ -486 +487 @@
             return self.add_view(request, form_url='../../add/')
 
         fields = flatten_fieldsets(self.fieldsets_change(request, obj))
-        ModelForm = forms.form_for_instance(obj, fields=fields, formfield_callback=self.formfield_for_dbfield)
+        ModelForm = forms.form_for_instance(obj, fields=fields, form=self.base_form, formfield_callback=self.formfield_for_dbfield)
 
         inline_formsets = []
         if request.method == 'POST':
@@ -669 +670 @@
     def formset_add(self, request):
         """Returns an InlineFormSet class for use in admin add views."""
         fields = flatten_fieldsets(self.fieldsets_add(request))
-        return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
+        return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, form=self.base_form, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
 
     def formset_change(self, request, obj):
         """Returns an InlineFormSet class for use in admin change views."""
         fields = flatten_fieldsets(self.fieldsets_change(request, obj))
-        return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
+        return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, form=self.base_form, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
 
     def _fieldsets(self, request):
         if self.fieldsets:

django/contrib/admin/templates/admin/change_form.html

@@ -37 +37 @@
 {% if adminform.form.errors %}
     <p class="errornote">
     {% blocktrans count adminform.form.errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
+    {{ adminform.form.non_field_errors }}
     </p>
 {% endif %}
 

django/newforms/models.py

@@ -305 +305 @@
         new_obj = self.model(**kwargs)
         return save_instance(form, new_obj, commit=commit)
 
-def inline_formset(parent_model, model, fk_name=None, fields=None, extra=3, orderable=False, deletable=True, formfield_callback=lambda f: f.formfield()):
+def inline_formset(parent_model, model, fk_name=None, fields=None, extra=3, orderable=False, deletable=True, form=BaseForm, formfield_callback=lambda f: f.formfield()):
     """
     Returns an ``InlineFormset`` for the given kwargs.
     
@@ -325 +325 @@
             raise Exception("%s has more than 1 ForeignKey to %s" % (model, parent_model))
     # let the formset handle object deletion by default
     FormSet = formset_for_model(model, formset=InlineFormset, fields=fields, 
-                                formfield_callback=formfield_callback, 
+                                form=form, formfield_callback=formfield_callback, 
                                 extra=extra, orderable=orderable, 
                                 deletable=deletable)
     # HACK: remove the ForeignKey to the parent from every form