Ticket #4727: newforms-admin-5559-allow-form-base-override.diff

django/contrib/admin/options.py

@@ -162 +162 @@
     filter_vertical = ()
     filter_horizontal = ()
     inlines = []
+    base_form = forms.BaseForm
 
     def __init__(self, model):
         self.model = model
@@ -412 +413 @@
             # Object list will give 'Permission Denied', so go back to admin home
             post_url = '../../../'
 
-        ModelForm = forms.form_for_model(model, formfield_callback=self.formfield_for_dbfield)
+        ModelForm = forms.form_for_model(model, form=self.base_form, formfield_callback=self.formfield_for_dbfield)
 
         inline_formsets = []
         if request.POST:
@@ -465 +466 @@
         if request.POST and request.POST.has_key("_saveasnew"):
             return self.add_view(request, form_url='../../add/')
 
-        ModelForm = forms.form_for_instance(obj, formfield_callback=self.formfield_for_dbfield)
+        ModelForm = forms.form_for_instance(obj, form=self.base_form, formfield_callback=self.formfield_for_dbfield)
 
         inline_formsets = []
         if request.POST:

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

@@ -38 +38 @@
 {% 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 %}