Commit a1bff5f8 authored by Joseph Kocherhans's avatar Joseph Kocherhans
Browse files

[1.1.X] Fixed #11681. Fixed display of non_field_errors and non_form_errors in... 

[1.1.X] Fixed #11681. Fixed display of non_field_errors and non_form_errors in the admin. Backport of r12541 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f48cf954

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

+1 −1
Original line number Diff line number Diff line
@@ -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 %}

django/contrib/admin/templates/admin/change_list.html

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,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 %}