diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-06 06:16:03 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-06 06:16:03 +0000 |
| commit | 5582ad149c6f4fcdd0a8dfaf1f22ed0f2bf295b2 (patch) | |
| tree | 156ddc5b0ee04804ef1c3bee598ea153a1f28c0e | |
| parent | 1291888153927072fb2c9ac735c42ce23a297668 (diff) | |
Fixed #14895 -- Ensure that USE_THOUSAND_SEPARATOR doesn't break the delete confirmation page. Thanks to Tuttle for the report, and Julien Phalip for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/templates/admin/delete_selected_confirmation.html | 4 | ||||
| -rw-r--r-- | tests/regressiontests/admin_views/tests.py | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html index 2bb4fb4742..127519bea7 100644 --- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n %} +{% load i18n l10n %} {% block breadcrumbs %} <div class="breadcrumbs"> @@ -36,7 +36,7 @@ <form action="" method="post">{% csrf_token %} <div> {% for obj in queryset %} - <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk }}" /> + <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}" /> {% endfor %} <input type="hidden" name="action" value="delete_selected" /> <input type="hidden" name="post" value="yes" /> diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py index 21c5eb3471..f3923931a5 100644 --- a/tests/regressiontests/admin_views/tests.py +++ b/tests/regressiontests/admin_views/tests.py @@ -1675,6 +1675,29 @@ class AdminActionsTest(TestCase): response = self.client.post('/test_admin/admin/admin_views/subscriber/', delete_confirmation_data) self.assertEqual(Subscriber.objects.count(), 0) + def test_non_localized_pk(self): + """If USE_THOUSAND_SEPARATOR is set, make sure that the ids for + the objects selected for deletion are rendered without separators. + Refs #14895. + """ + self.old_USE_THOUSAND_SEPARATOR = settings.USE_THOUSAND_SEPARATOR + self.old_USE_L10N = settings.USE_L10N + settings.USE_THOUSAND_SEPARATOR = True + settings.USE_L10N = True + subscriber = Subscriber.objects.get(id=1) + subscriber.id = 9999 + subscriber.save() + action_data = { + ACTION_CHECKBOX_NAME: [9999, 2], + 'action' : 'delete_selected', + 'index': 0, + } + response = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data) + self.assertTemplateUsed(response, 'admin/delete_selected_confirmation.html') + self.assertTrue('value="9999"' in response.content and 'value="2"' in response.content) # Instead of 9,999 + settings.USE_THOUSAND_SEPARATOR = self.old_USE_THOUSAND_SEPARATOR + settings.USE_L10N = self.old_USE_L10N + def test_model_admin_default_delete_action_protected(self): """ Tests the default delete action defined as a ModelAdmin method in the |