encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-02 20:54:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

partial argument should override required

Browse Source
This commit is contained in:
Mark Aaron Shirley 2012-11-21 09:36:37 -08:00
parent 3b43d41e91
commit 1adfc41dc7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/fields.py
View File

@ -53,6 +53,8 @@ class Field(object):
self.parent = parent self.parent = parent
self.root = parent.root or parent self.root = parent.root or parent
self.context = self.root.context self.context = self.root.context
if self.root.partial:
self.required = False
def field_from_native(self, data, files, field_name, into): def field_from_native(self, data, files, field_name, into):
""" """
@ -148,7 +150,7 @@ class WritableField(Field):
self.widget = widget self.widget = widget
def validate(self, value): def validate(self, value):
if value in validators.EMPTY_VALUES and self.required and not self.root.partial: if value in validators.EMPTY_VALUES and self.required:
raise ValidationError(self.error_messages['required']) raise ValidationError(self.error_messages['required'])
def run_validators(self, value): def run_validators(self, value):
@ -186,7 +188,7 @@ class WritableField(Field):
if self.default is not None: if self.default is not None:
native = self.default native = self.default
else: else:
if self.required and not self.root.partial: if self.required:
raise ValidationError(self.error_messages['required']) raise ValidationError(self.error_messages['required'])
return return