encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-21 03:19:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3273 from olliewalsh/breadcrumbs_view_name

Browse Source 
Do not ignore overridden View.get_view_name() in breadcrumbs
This commit is contained in:
Xavier Ordoquy 2016-03-23 01:10:13 +01:00
commit cfb77ae6fa
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/utils/breadcrumbs.py
View File

@ -9,11 +9,8 @@ def get_breadcrumbs(url, request=None):
tuple of (name, url). tuple of (name, url).
""" """
from rest_framework.reverse import preserve_builtin_query_params from rest_framework.reverse import preserve_builtin_query_params
from rest_framework.settings import api_settings
from rest_framework.views import APIView from rest_framework.views import APIView
view_name_func = api_settings.VIEW_NAME_FUNCTION
def breadcrumbs_recursive(url, breadcrumbs_list, prefix, seen): def breadcrumbs_recursive(url, breadcrumbs_list, prefix, seen):
""" """
Add tuples of (name, url) to the breadcrumbs list, Add tuples of (name, url) to the breadcrumbs list,
@ -31,8 +28,7 @@ def get_breadcrumbs(url, request=None):
# Don't list the same view twice in a row. # Don't list the same view twice in a row.
# Probably an optional trailing slash. # Probably an optional trailing slash.
if not seen or seen[-1] != view: if not seen or seen[-1] != view:
suffix = getattr(view, 'suffix', None) name = cls().get_view_name()
name = view_name_func(cls, suffix)
insert_url = preserve_builtin_query_params(prefix + url, request) insert_url = preserve_builtin_query_params(prefix + url, request)
breadcrumbs_list.insert(0, (name, insert_url)) breadcrumbs_list.insert(0, (name, insert_url))
seen.append(view) seen.append(view)

17
tests/test_utils.py
View File

@ -32,9 +32,15 @@ class NestedResourceInstance(APIView):
pass pass
class CustomNameResourceInstance(APIView):
def get_view_name(self):
return "Foo"
urlpatterns = [ urlpatterns = [
url(r'^$', Root.as_view()), url(r'^$', Root.as_view()),
url(r'^resource/$', ResourceRoot.as_view()), url(r'^resource/$', ResourceRoot.as_view()),
url(r'^resource/customname$', CustomNameResourceInstance.as_view()),
url(r'^resource/(?P<key>[0-9]+)$', ResourceInstance.as_view()), url(r'^resource/(?P<key>[0-9]+)$', ResourceInstance.as_view()),
url(r'^resource/(?P<key>[0-9]+)/$', NestedResourceRoot.as_view()), url(r'^resource/(?P<key>[0-9]+)/$', NestedResourceRoot.as_view()),
url(r'^resource/(?P<key>[0-9]+)/(?P<other>[A-Za-z]+)$', NestedResourceInstance.as_view()), url(r'^resource/(?P<key>[0-9]+)/(?P<other>[A-Za-z]+)$', NestedResourceInstance.as_view()),
@ -75,6 +81,17 @@ class BreadcrumbTests(TestCase):
] ]
) )
def test_resource_instance_customname_breadcrumbs(self):
url = '/resource/customname'
self.assertEqual(
get_breadcrumbs(url),
[
('Root', '/'),
('Resource Root', '/resource/'),
('Foo', '/resource/customname')
]
)
def test_nested_resource_breadcrumbs(self): def test_nested_resource_breadcrumbs(self):
url = '/resource/123/' url = '/resource/123/'
self.assertEqual( self.assertEqual(