summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorVilliers Strauss <villiers.strauss@logimeter.com>2015-05-22 15:54:31 +0200
committerTim Graham <timograham@gmail.com>2015-05-25 12:06:55 -0400
commit614bec41b5306b32b8de20d66f047ff8d6f35256 (patch)
treec3ce84b5d75dc9b9162d37c0298c4cd6fff9891d /django
parenta6b77abff75709ee09a0d31d450af601f1f806d9 (diff)
Fixed #24841 -- Made BaseRangeField.prepare_value() call base_field's prepare_value()
Diffstat (limited to 'django')
-rw-r--r--django/contrib/postgres/forms/ranges.py11
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):