Skip to content

Respect to_field property of ForeignKey relations #2435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Harper04 wants to merge 15 commits into from
Closed

Respect to_field property of ForeignKey relations #2435

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
067360c
Added support for the to_field on ForeignKey Fields.
Harper04 Jan 19, 2015
8263048
* many to many relationship do not have to_fields
Harper04 Jan 19, 2015
d47f29a
Fixed the rest of the test cases.
Harper04 Jan 19, 2015
49ecaa7
Add support for Django <1.6 where appearently no to_field existed
Harper04 Jan 19, 2015
6369f93
* Removed 2 unnecessary lines
Harper04 Jan 19, 2015
6007463
Merge branch 'master' of https://github.com/tomchristie/django-rest-f…
Harper04 Jan 19, 2015
f808b6c
* Removed SlugRelatedField optimization
Harper04 Jan 20, 2015
77eeefa
Merge branch 'master' of https://github.com/tomchristie/django-rest-f…
Harper04 Jan 20, 2015
3dd5ddd
Merge branch 'master' of https://github.com/tomchristie/django-rest-f…
Harper04 Jan 20, 2015
6ccc45e
Ups. Removed the wrong line. (optimizer)
Harper04 Jan 20, 2015
64c49f8
From this i believe it is field_name pre django 1.6. I still don’t ha…
Harper04 Jan 20, 2015
a496c52
to_field is rel.field_name at <1.6. love pdb and pip!
Harper04 Jan 20, 2015
8096997
Merge branch 'master' of https://github.com/tomchristie/django-rest-f…
Harper04 Apr 16, 2015
54e16f4
Merge branch 'master' into model-tofield-serializer
Harper04 Apr 16, 2015
5ca9841
* updated patch to latest DRF revision
Harper04 Apr 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
* Removed 2 unnecessary lines
  • Loading branch information
@Harper04
Harper04 committed Jan 19, 2015
commit 6369f93d041e1879ca8ef05f0fd8fe4875fc9360
4 changes: 1 addition & 3 deletions rest_framework/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,13 +1004,11 @@ def get_fields(self):
kwargs = get_nested_relation_kwargs(relation_info)
else:
kwargs = get_relation_kwargs(field_name, relation_info)
to_field = kwargs.get('to_field', False)
kwargs.pop('to_field', None)
to_field = kwargs.pop('to_field', None)
# it seems that some tests/django initializers are setting
# to_field where it is totally unnecessary
if to_field and to_field != 'id':
Copy link
Contributor

@lovelydinosaur lovelydinosaur Jan 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The primary key may not be named 'id' so I'm unsure about this.

Copy link
Author

@Harper04 Harper04 Jan 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see 2 (outdated diffs) above

Copy link
Contributor

@kevin-brown kevin-brown Jan 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add some clarification on this? The comment is a bit vauge about what the issue actually is, though I assume it has to do with AutoField considering it involves the id field?

I understand the point of doing if to_field, not the additional check though.

Copy link
Author

@Harper04 Harper04 Jan 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it also has to do with what gets into that to_field and makes it to that point. I would remove any 'id' entries in compat/get_to_field making this check here unnecessary. Maybe not the best solution but the to_field irritates me for now. I think for plain ForeignKeys it is safe but for anything else... i dont know.

I added some links to the core issue of that 2 posts above. Thats what i meant.

# using the slug field for now
kwargs.pop('to_field', None)
kwargs['slug_field'] = to_field
field_cls = self._related_to_field_class
else:
Expand Down