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

Cleanup.

Browse Source
This commit is contained in:
Marko Tibold 2012-11-22 23:39:16 +01:00
parent ca5b99486d
commit bd8c742df2
1 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rest_framework/serializers.py
View File

@ -461,49 +461,13 @@ class ModelSerializer(Serializer):
return restored_object return restored_object
def perform_model_validation(self, restored_object): def perform_model_validation(self, restored_object):
# if hasattr(restored_object, '__iter__'): # Iterables are not model instances
# return restored_object
#self._errors[field_name] = list(err.messages)
# opts = self._meta
# Update the model instance with self.cleaned_data.
# instance = construct_instance(self, self.instance, opts.fields, opts.exclude)
# exclude = self._get_validation_exclusions()
# Foreign Keys being used to represent inline relationships
# are excluded from basic field value validation. This is for two
# reasons: firstly, the value may not be supplied (#12507; the
# case of providing new values to the admin); secondly the
# object being referred to may not yet fully exist (#12749).
# However, these fields *must* be included in uniqueness checks,
# so this can't be part of _get_validation_exclusions().
# for f_name, field in self.fields.items():
# if isinstance(field, InlineForeignKeyField):
# exclude.append(f_name)
# Clean the model instance's fields.
try: try:
restored_object.clean_fields() # exclude=exclude) # Call Django's full_clean() which in turn calls: Model.clean_fields(), Model.clean(), Model.validat_unique()
restored_object.full_clean(exclude=list(self.opts.exclude))
except ValidationError as e: except ValidationError as e:
for field_name, error_messages in e.message_dict.items(): for field_name, error_messages in e.message_dict.items():
self._errors[field_name] = self._errors.get(field_name, []) + list(error_messages) self._errors[field_name] = self._errors.get(field_name, []) + list(error_messages)
# Call the model instance's clean method.
try:
restored_object.clean()
except ValidationError as e:
for field_name, error_messages in e.message_dict.items():
self._errors[field_name] = self._errors.get(field_name, []) + list(error_messages)
# Validate uniqueness if needed.
# exclude = self._get_validation_exclusions()
# try:
# restored_object.validate_unique() # exclude=exclude)
# except ValidationError as e:
# model_errors.append(e.message_dict)
def restore_object(self, attrs, instance=None): def restore_object(self, attrs, instance=None):
""" """
Restore the model instance. Restore the model instance.