diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2008-11-09 18:54:12 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2008-11-09 18:54:12 +0000 |
| commit | 3ced836c73583bf054709e6312a2ba674a9bc633 (patch) | |
| tree | 282f3fbbd903b83df250ca81b12816b072c008f0 | |
| parent | dc0389cca04bf84dbc32ca2c9e1e6d5c3267e51a (diff) | |
[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
| -rw-r--r-- | django/contrib/admin/templates/admin/change_form.html | 2 | ||||
| -rw-r--r-- | tests/regressiontests/admin_views/tests.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index ca9db6c1c6..ab63ecf6e0 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -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 %} diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py index 26d807e731..4a568279e7 100644 --- a/tests/regressiontests/admin_views/tests.py +++ b/tests/regressiontests/admin_views/tests.py @@ -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): |