encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-01 14:04:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set field length/values as actual attributes.

Browse Source 
The SimpleMetadata class in metadata.py tries to getattr() attributes
on a field. For this to work, max_length and min_length have to be
actually set as an attribute.
Did the same for min_value and max_value and added those two to
SimpleMetadata.get_field_info
This commit is contained in:
Rense VanderHoek 2015-02-20 16:31:12 +01:00
parent dc8cc86077
commit c8609ba652
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
rest_framework/fields.py
View File

@ -556,15 +556,15 @@ class CharField(Field):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.allow_blank = kwargs.pop('allow_blank', False) self.allow_blank = kwargs.pop('allow_blank', False)
self.trim_whitespace = kwargs.pop('trim_whitespace', True) self.trim_whitespace = kwargs.pop('trim_whitespace', True)
max_length = kwargs.pop('max_length', None) self.max_length = kwargs.pop('max_length', None)
min_length = kwargs.pop('min_length', None) self.min_length = kwargs.pop('min_length', None)
super(CharField, self).__init__(**kwargs) super(CharField, self).__init__(**kwargs)
if max_length is not None: if self.max_length is not None:
message = self.error_messages['max_length'].format(max_length=max_length) message = self.error_messages['max_length'].format(max_length=self.max_length)
self.validators.append(MaxLengthValidator(max_length, message=message)) self.validators.append(MaxLengthValidator(self.max_length, message=message))
if min_length is not None: if self.min_length is not None:
message = self.error_messages['min_length'].format(min_length=min_length) message = self.error_messages['min_length'].format(min_length=self.min_length)
self.validators.append(MinLengthValidator(min_length, message=message)) self.validators.append(MinLengthValidator(self.min_length, message=message))
def run_validation(self, data=empty): def run_validation(self, data=empty):
# Test for the empty string here so that it does not get validated, # Test for the empty string here so that it does not get validated,
@ -658,15 +658,15 @@ class IntegerField(Field):
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.
def __init__(self, **kwargs): def __init__(self, **kwargs):
max_value = kwargs.pop('max_value', None) self.max_value = kwargs.pop('max_value', None)
min_value = kwargs.pop('min_value', None) self.min_value = kwargs.pop('min_value', None)
super(IntegerField, self).__init__(**kwargs) super(IntegerField, self).__init__(**kwargs)
if max_value is not None: if self.max_value is not None:
message = self.error_messages['max_value'].format(max_value=max_value) message = self.error_messages['max_value'].format(max_value=self.max_value)
self.validators.append(MaxValueValidator(max_value, message=message)) self.validators.append(MaxValueValidator(self.max_value, message=message))
if min_value is not None: if self.min_value is not None:
message = self.error_messages['min_value'].format(min_value=min_value) message = self.error_messages['min_value'].format(min_value=self.min_value)
self.validators.append(MinValueValidator(min_value, message=message)) self.validators.append(MinValueValidator(self.min_value, message=message))
def to_internal_value(self, data): def to_internal_value(self, data):
if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH: if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH:
@ -692,15 +692,15 @@ class FloatField(Field):
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.
def __init__(self, **kwargs): def __init__(self, **kwargs):
max_value = kwargs.pop('max_value', None) self.max_value = kwargs.pop('max_value', None)
min_value = kwargs.pop('min_value', None) self.min_value = kwargs.pop('min_value', None)
super(FloatField, self).__init__(**kwargs) super(FloatField, self).__init__(**kwargs)
if max_value is not None: if self.max_value is not None:
message = self.error_messages['max_value'].format(max_value=max_value) message = self.error_messages['max_value'].format(max_value=self.max_value)
self.validators.append(MaxValueValidator(max_value, message=message)) self.validators.append(MaxValueValidator(self.max_value, message=message))
if min_value is not None: if self.min_value is not None:
message = self.error_messages['min_value'].format(min_value=min_value) message = self.error_messages['min_value'].format(min_value=self.min_value)
self.validators.append(MinValueValidator(min_value, message=message)) self.validators.append(MinValueValidator(self.min_value, message=message))
def to_internal_value(self, data): def to_internal_value(self, data):
if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH: if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH:
@ -733,12 +733,14 @@ class DecimalField(Field):
self.max_digits = max_digits self.max_digits = max_digits
self.decimal_places = decimal_places self.decimal_places = decimal_places
self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string
self.max_value = kwargs.pop('max_value', None)
self.min_value = kwargs.pop('min_value', None)
super(DecimalField, self).__init__(**kwargs) super(DecimalField, self).__init__(**kwargs)
if max_value is not None: if self.max_value is not None:
message = self.error_messages['max_value'].format(max_value=max_value) message = self.error_messages['max_value'].format(max_value=self.max_value)
self.validators.append(MaxValueValidator(max_value, message=message)) self.validators.append(MaxValueValidator(max_value, message=message))
if min_value is not None: if self.min_value is not None:
message = self.error_messages['min_value'].format(min_value=min_value) message = self.error_messages['min_value'].format(min_value=self.min_value)
self.validators.append(MinValueValidator(min_value, message=message)) self.validators.append(MinValueValidator(min_value, message=message))
def to_internal_value(self, data): def to_internal_value(self, data):

8
rest_framework/metadata.py
View File

@ -115,7 +115,13 @@ class SimpleMetadata(BaseMetadata):
field_info['type'] = self.label_lookup[field] field_info['type'] = self.label_lookup[field]
field_info['required'] = getattr(field, 'required', False) field_info['required'] = getattr(field, 'required', False)
for attr in ['read_only', 'label', 'help_text', 'min_length', 'max_length']: attrs = [
'read_only', 'label', 'help_text',
'min_length', 'max_length',
'min_value', 'max_value'
]
for attr in attrs:
value = getattr(field, attr, None) value = getattr(field, attr, None)
if value is not None and value != '': if value is not None and value != '':
field_info[attr] = force_text(value, strings_only=True) field_info[attr] = force_text(value, strings_only=True)