summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Kocherhans <joseph@jkocherhans.com>2010-02-23 18:56:00 +0000
committerJoseph Kocherhans <joseph@jkocherhans.com>2010-02-23 18:56:00 +0000
commit3f443363f9bd65fdb77a20693637e721696c0414 (patch)
tree0a3f23a4fde4d47f699ecb024d85f8c3255f4273
parentfd233f40d1922c6f3d9dd0e5738397bdc4aac9ef (diff)
Fixed #11681. Fixed display of non_field_errors and non_form_errors in the admin. Thanks, nessita.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/templates/admin/change_form.html2
-rw-r--r--django/contrib/admin/templates/admin/change_list.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html
index 2db16bda05..7c96628963 100644
--- a/django/contrib/admin/templates/admin/change_form.html
+++ b/django/contrib/admin/templates/admin/change_form.html
@@ -38,7 +38,7 @@
<p class="errornote">
{% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
</p>
- <ul class="errorlist">{% for error in adminform.form.non_field_errors %}<li>{{ error }}</li>{% endfor %}</ul>
+ {{ adminform.form.non_field_errors }}
{% endif %}
{% for fieldset in adminform %}
diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html
index 466480a04b..5593128c05 100644
--- a/django/contrib/admin/templates/admin/change_list.html
+++ b/django/contrib/admin/templates/admin/change_list.html
@@ -67,7 +67,7 @@
<p class="errornote">
{% blocktrans count cl.formset.errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
</p>
- <ul class="errorlist">{% for error in cl.formset.non_form_errors %}<li>{{ error }}</li>{% endfor %}</ul>
+ {{ cl.formset.non_form_errors }}
{% endif %}
<div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
{% block search %}{% search_form cl %}{% endblock %}