Commit d72e0178 authored by Eric Rouleau's avatar Eric Rouleau Committed by Simon Charette
Browse files

Fixed #24593 -- Fixed number formatting of readonly IntegerFields in the admin.

parent 6b8c9698

django/contrib/admin/utils.py

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ def display_for_field(value, field): 
        return formats.localize(value)

    elif isinstance(field, models.DecimalField):

        return formats.number_format(value, field.decimal_places)

    elif isinstance(field, models.FloatField):

    elif isinstance(field, (models.IntegerField, models.FloatField)):

        return formats.number_format(value)

    elif isinstance(field, models.FileField) and value:

        return format_html('<a href="{}">{}</a>', value.url, value)

tests/admin_utils/tests.py

+6 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ class UtilsTests(TestCase): 
        display_value = display_for_field(Decimal('12345.6789'), models.DecimalField())

        self.assertEqual(display_value, '12345.6789')



        display_value = display_for_field(12345, models.IntegerField())

        self.assertEqual(display_value, '12345')



    @override_settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True)

    def test_number_formats_with_thousand_seperator_display_for_field(self):

        display_value = display_for_field(12345.6789, models.FloatField())
@@ -188,6 +191,9 @@ class UtilsTests(TestCase): 
        display_value = display_for_field(Decimal('12345.6789'), models.DecimalField())

        self.assertEqual(display_value, '12,345.6789')



        display_value = display_for_field(12345, models.IntegerField())

        self.assertEqual(display_value, '12,345')



    def test_label_for_field(self):

        """

        Tests for label_for_field