diff options
author | Michael Angeletti <michael@angelettigroup.com> | 2015-02-21 13:27:49 -0500 |
---|---|---|
committer | Michael Angeletti <michael@angelettigroup.com> | 2015-02-21 13:27:49 -0500 |
commit | ea3168dc6ced391d848c511a14cfcecfeac9d401 (patch) | |
tree | e3cde5d90628407e6f735e1e74b538d1055f6cd5 | |
parent | 787dd6519a791f210dc8275eaf2fd41454bf9670 (diff) | |
download | django-ea3168dc6ced391d848c511a14cfcecfeac9d401.tar.gz |
Fixed #24376 -- added verbose_name arg to UUIDField
-rw-r--r-- | django/db/models/fields/__init__.py | 4 | ||||
-rw-r--r-- | tests/model_fields/models.py | 2 | ||||
-rw-r--r-- | tests/model_fields/tests.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index dc9cfa836e..975653d410 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -2369,9 +2369,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() diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py index 3decc29aba..bc96bf3f9b 100644 --- a/tests/model_fields/models.py +++ b/tests/model_fields/models.py @@ -179,6 +179,8 @@ class VerboseNameField(models.Model): field19 = models.TextField("verbose field19") field20 = models.TimeField("verbose field20") field21 = models.URLField("verbose field21") + field22 = models.UUIDField("verbose field22") + field23 = models.DurationField("verbose field23") class GenericIPAddress(models.Model): diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py index 379d9e8b52..a8291b6e71 100644 --- a/tests/model_fields/tests.py +++ b/tests/model_fields/tests.py @@ -76,7 +76,7 @@ class BasicFieldTests(test.TestCase): def test_field_verbose_name(self): m = VerboseNameField - for i in range(1, 22): + for i in range(1, 24): self.assertEqual(m._meta.get_field('field%d' % i).verbose_name, 'verbose field%d' % i) |