Commit 1feeefe9 authored by Michael Angeletti's avatar Michael Angeletti Committed by Tim Graham
Browse files

[1.8.x] Fixed #24376 -- added verbose_name arg to UUIDField 

Backport of ea3168dc from master
parent 481d3bd6

django/db/models/fields/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -2377,9 +2377,9 @@ class UUIDField(Field): 
    description = 'Universally unique identifier'

    empty_strings_allowed = False



    def __init__(self, **kwargs):

    def __init__(self, verbose_name=None, **kwargs):

        kwargs['max_length'] = 32

        super(UUIDField, self).__init__(**kwargs)

        super(UUIDField, self).__init__(verbose_name, **kwargs)



    def deconstruct(self):

        name, path, args, kwargs = super(UUIDField, self).deconstruct()

tests/model_fields/models.py

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ class VerboseNameField(models.Model): 
    field20 = models.TextField("verbose field20")

    field21 = models.TimeField("verbose field21")

    field22 = models.URLField("verbose field22")

    field23 = models.UUIDField("verbose field23")

    field24 = models.DurationField("verbose field24")





class GenericIPAddress(models.Model):

tests/model_fields/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class BasicFieldTests(test.TestCase): 


    def test_field_verbose_name(self):

        m = VerboseNameField

        for i in range(1, 23):

        for i in range(1, 25):

            self.assertEqual(m._meta.get_field('field%d' % i).verbose_name,

                             'verbose field%d' % i)