Ticket #14895: 14895_delete_confirmation_1000_separator_plus_tests.diff

django/contrib/admin/templates/admin/delete_selected_confirmation.html

@@ -36 +36 @@
     <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|stringformat:"s" }}" />
     {% endfor %}
     <input type="hidden" name="action" value="delete_selected" />
     <input type="hidden" name="post" value="yes" />

tests/regressiontests/admin_views/tests.py

@@ -1674 +1674 @@
         self.assertTrue(confirmation.content.count(ACTION_CHECKBOX_NAME) == 2)
         response = self.client.post('/test_admin/admin/admin_views/subscriber/', delete_confirmation_data)
         self.assertEqual(Subscriber.objects.count(), 0)
-
+    
+    def test_ticket_14895(self):
+        """ Regression test for #14895. If USE_THOUSAND_SEPARATOR is set, make sure that the ids for
+            the objects selected for deletion are rendered without separators.
+        """
+        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)
+        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