Skip to content

Support 1.8-alpha. #2446

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
lovelydinosaur merged 8 commits into from
Jan 23, 2015
Merged

Support 1.8-alpha. #2446

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
25a703b
Work around meta API differences
lovelydinosaur Jan 23, 2015
5eb6949
Drop django-filter from 1.8
lovelydinosaur Jan 23, 2015
e307fd2
Fix test matrix
lovelydinosaur Jan 23, 2015
e988d57
Fix template loader monkey patching to also support 1.8
lovelydinosaur Jan 23, 2015
4cb164b
Add missing skipUnless(django_filters)
lovelydinosaur Jan 23, 2015
f1ac9d3
More graceful handling of malformed Content-Disposition
lovelydinosaur Jan 23, 2015
f3b6eed
More sensible response caching.
lovelydinosaur Jan 23, 2015
04a5f7b
Move 1.8-alpha out of 'expected failures'
lovelydinosaur Jan 23, 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
Next Next commit
Work around meta API differences
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Jan 23, 2015
commit 25a703b42c030f712734ed56b8f1996f8d13ac0c
10 changes: 8 additions & 2 deletions rest_framework/utils/model_meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,28 @@ def _get_reverse_relationships(opts):
"""
Returns an `OrderedDict` of field names to `RelationInfo`.
"""
# Note that we have a hack here to handle internal API differences for
# this internal API across Django 1.7 -> Django 1.8.
# See: https://code.djangoproject.com/ticket/24208

reverse_relations = OrderedDict()
for relation in opts.get_all_related_objects():
accessor_name = relation.get_accessor_name()
related = getattr(relation, 'related_model', relation.model)
reverse_relations[accessor_name] = RelationInfo(
model_field=None,
related=relation.model,
related=related,
to_many=relation.field.rel.multiple,
has_through_model=False
)

# Deal with reverse many-to-many relationships.
for relation in opts.get_all_related_many_to_many_objects():
accessor_name = relation.get_accessor_name()
related = getattr(relation, 'related_model', relation.model)
reverse_relations[accessor_name] = RelationInfo(
model_field=None,
related=relation.model,
related=related,
to_many=True,
has_through_model=(
(getattr(relation.field.rel, 'through', None) is not None)
Expand Down