encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-09 06:44:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Modified build_relational_field() to change its behaviour if relationship is reverse vs forward to ensure correct field checking

Browse Source
This commit is contained in:
bphillips 2015-12-03 14:08:59 -05:00
parent ce98c3d921
commit 21839e45c6
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest_framework/serializers.py
View File

@ -1131,9 +1131,14 @@ class ModelSerializer(Serializer):
field_kwargs = get_relation_kwargs(field_name, relation_info) field_kwargs = get_relation_kwargs(field_name, relation_info)
to_field = field_kwargs.pop('to_field', None) to_field = field_kwargs.pop('to_field', None)
if to_field and not relation_info.related_model._meta.get_field(to_field).primary_key: if relation_info.reverse:
field_kwargs['slug_field'] = to_field if to_field and not relation_info.related_model_field.related_field.primary_key:
field_class = self.serializer_related_to_field field_kwargs['slug_field'] = to_field
field_class = self.serializer_related_to_field
else:
if to_field and not relation_info.related_model._meta.get_field(to_field).primary_key:
field_kwargs['slug_field'] = to_field
field_class = self.serializer_related_to_field
# `view_name` is only valid for hyperlinked relationships. # `view_name` is only valid for hyperlinked relationships.
if not issubclass(field_class, HyperlinkedRelatedField): if not issubclass(field_class, HyperlinkedRelatedField):

2
rest_framework/utils/field_mapping.py
View File

@ -238,7 +238,7 @@ def get_relation_kwargs(field_name, relation_info):
""" """
Creates a default instance of a flat relational field. Creates a default instance of a flat relational field.
""" """
model_field, related_model, to_many, to_field, has_through_model = relation_info model_field, related_model, related_model_field, to_many, to_field, has_through_model, reverse = relation_info
kwargs = { kwargs = {
'queryset': related_model._default_manager, 'queryset': related_model._default_manager,
'view_name': get_detail_view_name(related_model) 'view_name': get_detail_view_name(related_model)

22
rest_framework/utils/model_meta.py
View File

@ -29,9 +29,11 @@ FieldInfo = namedtuple('FieldResult', [
RelationInfo = namedtuple('RelationInfo', [ RelationInfo = namedtuple('RelationInfo', [
'model_field', 'model_field',
'related_model', 'related_model',
'related_model_field',
'to_many', 'to_many',
'to_field', 'to_field',
'has_through_model' 'has_through_model',
'reverse'
]) ])
@ -108,9 +110,11 @@ def _get_forward_relationships(opts):
forward_relations[field.name] = RelationInfo( forward_relations[field.name] = RelationInfo(
model_field=field, model_field=field,
related_model=_resolve_model(field.rel.to), related_model=_resolve_model(field.rel.to),
related_model_field=None,
to_many=False, to_many=False,
to_field=_get_to_field(field), to_field=_get_to_field(field),
has_through_model=False has_through_model=False,
reverse=False
) )
# Deal with forward many-to-many relationships. # Deal with forward many-to-many relationships.
@ -118,12 +122,14 @@ def _get_forward_relationships(opts):
forward_relations[field.name] = RelationInfo( forward_relations[field.name] = RelationInfo(
model_field=field, model_field=field,
related_model=_resolve_model(field.rel.to), related_model=_resolve_model(field.rel.to),
related_model_field=None,
to_many=True, to_many=True,
# manytomany do not have to_fields # manytomany do not have to_fields
to_field=None, to_field=None,
has_through_model=( has_through_model=(
not field.rel.through._meta.auto_created not field.rel.through._meta.auto_created
) ),
reverse=False
) )
return forward_relations return forward_relations
@ -144,9 +150,11 @@ def _get_reverse_relationships(opts):
reverse_relations[accessor_name] = RelationInfo( reverse_relations[accessor_name] = RelationInfo(
model_field=None, model_field=None,
related_model=related, related_model=related,
related_model_field=relation.field,
to_many=relation.field.rel.multiple, to_many=relation.field.rel.multiple,
to_field=_get_to_field(relation.field.model._meta.pk), to_field=_get_to_field(relation.field),
has_through_model=False has_through_model=False,
reverse=True
) )
# Deal with reverse many-to-many relationships. # Deal with reverse many-to-many relationships.
@ -156,13 +164,15 @@ def _get_reverse_relationships(opts):
reverse_relations[accessor_name] = RelationInfo( reverse_relations[accessor_name] = RelationInfo(
model_field=None, model_field=None,
related_model=related, related_model=related,
related_model_field=relation.field,
to_many=True, to_many=True,
# manytomany do not have to_fields # manytomany do not have to_fields
to_field=None, to_field=None,
has_through_model=( has_through_model=(
(getattr(relation.field.rel, 'through', None) is not None) and (getattr(relation.field.rel, 'through', None) is not None) and
not relation.field.rel.through._meta.auto_created not relation.field.rel.through._meta.auto_created
) ),
reverse=True
) )
return reverse_relations return reverse_relations