Skip to content

Fix/auto prefetch with m2m #333

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

Merged
merged 7 commits into from
May 6, 2017
Merged

Fix/auto prefetch with m2m #333

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0f709ae
Get the field queryset in a more reliable way
bor3ham Mar 14, 2017
273314a
Update test views to use optimised viewset
bor3ham Mar 14, 2017
18744ad
Rename comment_set to comments, use json viewset
bor3ham Mar 14, 2017
8ba1547
Correctly prefetch both forward and reverse
bor3ham Mar 14, 2017
40e3c91
Support field rename in older django
bor3ham Mar 14, 2017
63551f2
Update to py2 friendly super
bor3ham Mar 14, 2017
c374c6d
Replace hasattr with explicit version check
bor3ham Mar 14, 2017
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
Support field rename in older django
  • Loading branch information
@bor3ham
bor3ham committed Mar 14, 2017
commit 40e3c91fd2ccd9b905645c64a99044ce2f70772c
10 changes: 8 additions & 2 deletions rest_framework_json_api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,16 @@ def get_queryset(self, *args, **kwargs):
if level == levels[-1]:
included_model = field
else:
# patch for older versions of django
if hasattr(field, 'field'):
model_field = field.field
else:
model_field = field.related

if is_forward_relation:
level_model = field.field.related_model
level_model = model_field.related_model
else:
level_model = field.field.model
level_model = model_field.model

if included_model is not None:
qs = qs.prefetch_related(included.replace('.', '__'))
Expand Down