diff options
| author | Villiers Strauss <villiers.strauss@logimeter.com> | 2015-05-22 15:54:31 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-05-25 12:07:25 -0400 |
| commit | 4311fd2c0a5611c3103ffbae41973fd1552657a2 (patch) | |
| tree | 1ed0635112bc8147f18e81194cf1416a5cdafe50 /django | |
| parent | 1f33bf78fd198f4d67fe13743337d0f2b245af99 (diff) | |
[1.8.x] Fixed #24841 -- Made BaseRangeField.prepare_value() call base_field's prepare_value()
Backport of 614bec41b5306b32b8de20d66f047ff8d6f35256 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/postgres/forms/ranges.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/django/contrib/postgres/forms/ranges.py b/django/contrib/postgres/forms/ranges.py index cab2267685..75e5691d83 100644 --- a/django/contrib/postgres/forms/ranges.py +++ b/django/contrib/postgres/forms/ranges.py @@ -22,10 +22,17 @@ class BaseRangeField(forms.MultiValueField): super(BaseRangeField, self).__init__(**kwargs) def prepare_value(self, value): + lower_base, upper_base = self.fields if isinstance(value, self.range_type): - return [value.lower, value.upper] + return [ + lower_base.prepare_value(value.lower), + upper_base.prepare_value(value.upper), + ] if value is None: - return [None, None] + return [ + lower_base.prepare_value(None), + upper_base.prepare_value(None), + ] return value def compress(self, values): |
