From 0f3f082ed520fb1627379526220553a013fbc867 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Tue, 10 Jun 2008 05:01:17 +0000
Subject: [PATCH] newforms-admin: Fixed #5765 -- non_form_errors now display
 properly for inline formsets. Thanks Honza Kral.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/admin/templates/admin/edit_inline/stacked.html | 3 ++-
 django/contrib/admin/templates/admin/edit_inline/tabular.html | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html
index 2640006da2..c726b0fcda 100644
--- a/django/contrib/admin/templates/admin/edit_inline/stacked.html
+++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html
@@ -2,6 +2,7 @@
 <div class="inline-group">
 {{ inline_admin_formset.formset.management_form }}
 {# <h3 class="header">{{ inline_admin_formset.opts.verbose_name_plural|title }}</h3> #}
+{{ inline_admin_formset.formset.non_form_errors }}
 
 {% for inline_admin_form in inline_admin_formset %}
 <div class="inline-related {% if forloop.last %}last-related{% endif %}">
@@ -22,4 +23,4 @@
 {# <ul class="tools"> #}
 {#   <li><a class="add" href="">Add another {{ inline_admin_formset.opts.verbose_name|title }}</a></li> #}
 {# </ul> #}
-</div>
\ No newline at end of file
+</div>
diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html
index 934854a052..f6332fafbc 100644
--- a/django/contrib/admin/templates/admin/edit_inline/tabular.html
+++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html
@@ -4,6 +4,7 @@
 {{ inline_admin_formset.formset.management_form }}
 <fieldset class="module">
    <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst|escape }}</h2>
+   {{ inline_admin_formset.formset.non_form_errors }}
    <table>
      <thead><tr>
      {% for field in inline_admin_formset.fields %}