encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-28 17:09:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

1.Revoked the previous change fixed the uniquetogether validator

Browse Source
This commit is contained in:
anvesh agarwal 2019-10-24 16:20:54 +05:30
parent 0cc4624d02
commit aa500b3506
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/serializers.py
View File

@ -448,10 +448,7 @@ class Serializer(BaseSerializer, metaclass=SerializerMetaclass):
default = field.get_default() default = field.get_default()
except SkipField: except SkipField:
continue continue
if field.source == None: defaults[field.field_name] = default
defaults[field.field_name] = default
else:
defaults[field.source] = default
return defaults return defaults

7
rest_framework/validators.py
View File

@ -107,6 +107,7 @@ class UniqueTogetherValidator:
""" """
# Determine the existing instance, if this is an update operation. # Determine the existing instance, if this is an update operation.
self.instance = getattr(serializer, 'instance', None) self.instance = getattr(serializer, 'instance', None)
self.serializer = serializer
def enforce_required_fields(self, attrs): def enforce_required_fields(self, attrs):
""" """
@ -137,7 +138,11 @@ class UniqueTogetherValidator:
# Determine the filter keyword arguments and filter the queryset. # Determine the filter keyword arguments and filter the queryset.
filter_kwargs = { filter_kwargs = {
field_name: attrs[field_name] (
field_name
if field_name == self.serializer.fields[field_name].source
else self.serializer.fields[field_name].source
): attrs[field_name]
for field_name in self.fields for field_name in self.fields
} }
return qs_filter(queryset, **filter_kwargs) return qs_filter(queryset, **filter_kwargs)