Commit 3ced836c authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] Fixed #9514 -- Made admin change_form template correctly... 

[1.0.X] Fixed #9514 -- Made admin change_form template correctly recognize/report when a form has only a single error. 

[9371] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent dc0389cc

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
{% if save_on_top %}{% submit_row %}{% endif %}

{% if errors %}

    <p class="errornote">

    {% blocktrans count errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}

    {% 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>

{% endif %}

tests/regressiontests/admin_views/tests.py

+12 −0
Original line number Diff line number Diff line
@@ -387,6 +387,18 @@ class AdminViewPermissionsTest(TestCase): 
        post = self.client.post('/test_admin/admin/admin_views/article/1/', change_dict)

        self.assertRedirects(post, '/test_admin/admin/admin_views/article/')

        self.failUnlessEqual(Article.objects.get(pk=1).content, '<p>edited article</p>')

        

        # one error in form should produce singular error message, multiple errors plural

        change_dict['title'] = ''

        post = self.client.post('/test_admin/admin/admin_views/article/1/', change_dict)

        self.failUnlessEqual(request.status_code, 200)

        self.failUnless('Please correct the error below.' in post.content,

                        'Singular error message not found in response to post with one error.')

        change_dict['content'] = ''

        post = self.client.post('/test_admin/admin/admin_views/article/1/', change_dict)

        self.failUnlessEqual(request.status_code, 200)

        self.failUnless('Please correct the errors below.' in post.content,

                        'Plural error message not found in response to post with multiple errors.')        

        self.client.get('/test_admin/admin/logout/')



    def testCustomModelAdminTemplates(self):