diff options
| author | Tim Graham <timograham@gmail.com> | 2013-07-12 16:05:14 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-07-12 16:05:14 -0400 |
| commit | f2cb94f1c0dc98663e7d493411bf9b82d1894559 (patch) | |
| tree | cdf7a20d2cd5c023b4f5237dab4e811fd9560e8a /django | |
| parent | a7d97a6778ca528199920901ed2f66e289ee5a44 (diff) | |
Fixed #20740 -- GenericIPAddressField should pass protocol to formfield()
Thanks Jeff250.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/fields/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 02d887b7f8..a7e0b52e87 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1334,7 +1334,10 @@ class GenericIPAddressField(Field): return value def formfield(self, **kwargs): - defaults = {'form_class': forms.GenericIPAddressField} + defaults = { + 'protocol': self.protocol, + 'form_class': forms.GenericIPAddressField, + } defaults.update(kwargs) return super(GenericIPAddressField, self).formfield(**defaults) |