Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Get model managers and names in a version-compatible manner.
  • Loading branch information
lovelydinosaur committed Jun 1, 2016
commit 96aaa24e9b24a3d2938e3c0924bd456f12951d33
13 changes: 13 additions & 0 deletions rest_framework/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,19 @@ def distinct(queryset, base):
return queryset.distinct()


def get_names_and_managers(options):
if django.VERSION >= (1, 10):
return [
(manager.name, manager)
for manager
in options.managers
]
return [
(manager_info[1], manager_info[2])
for manager_info
in (options.concrete_managers + options.abstract_managers)
]

# contrib.postgres only supported from 1.8 onwards.
try:
from django.contrib.postgres import fields as postgres_fields
Expand Down
8 changes: 4 additions & 4 deletions rest_framework/utils/representation.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
from django.utils.encoding import force_text
from django.utils.functional import Promise

from rest_framework.compat import unicode_repr
from rest_framework.compat import get_names_and_managers, unicode_repr


def manager_repr(value):
model = value.model
opts = model._meta
for _, name, manager in opts.concrete_managers + opts.abstract_managers:
if manager == value:
return '%s.%s.all()' % (model._meta.object_name, name)
for manager_name, manager_instance in get_names_and_managers(opts):
if manager_instance == value:
return '%s.%s.all()' % (model._meta.object_name, manager_name)
return repr(value)


Expand Down