From c06513d1a2b40c4cec009b7ffd8954758c21162e Mon Sep 17 00:00:00 2001 From: Matthew Medal Date: Mon, 19 Dec 2016 16:38:06 -0800 Subject: [PATCH] ensure suffixes are appended in breadcrumb util --- rest_framework/utils/breadcrumbs.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index 5da23a2b2..e6e7e3cc3 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -9,12 +9,8 @@ def get_breadcrumbs(url, request=None): tuple of (name, url). """ from rest_framework.reverse import preserve_builtin_query_params - from rest_framework.settings import api_settings from rest_framework.views import APIView - apiview_default_get_view_name = APIView.get_view_name - get_view_name = api_settings.VIEW_NAME_FUNCTION - def breadcrumbs_recursive(url, breadcrumbs_list, prefix, seen): """ Add tuples of (name, url) to the breadcrumbs list, @@ -32,13 +28,9 @@ def get_breadcrumbs(url, request=None): # Don't list the same view twice in a row. # Probably an optional trailing slash. if not seen or seen[-1] != view: - # Check if get_view_name has been overridden - # else ensure that view_name suffixes are caught - if cls.get_view_name is not apiview_default_get_view_name: - name = cls().get_view_name() - else: - suffix = getattr(view, 'suffix', None) - name = get_view_name(cls, suffix) + c = cls() + c.suffix = getattr(view, 'suffix', None) + name = c.get_view_name() insert_url = preserve_builtin_query_params(prefix + url, request) breadcrumbs_list.insert(0, (name, insert_url)) seen.append(view)