Deal with List/Instance suffixes for viewsets

2 files changed, 7 insertions, 3 deletions

diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py
index 18b3b207..8f8e5710 100644
--- a/rest_framework/utils/breadcrumbs.py
+++ b/rest_framework/utils/breadcrumbs.py
@@ -21,7 +21,8 @@ def get_breadcrumbs(url):
                 # Don't list the same view twice in a row.
                 # Probably an optional trailing slash.
                 if not seen or seen[-1] != view:
-                    breadcrumbs_list.insert(0, (get_view_name(view.cls), prefix + url))
+                    suffix = getattr(view, 'suffix', None)
+                    breadcrumbs_list.insert(0, (get_view_name(view.cls, suffix), prefix + url))
                     seen.append(view)
 
         if url == '':
diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py
index 79566db1..ebadb3a6 100644
--- a/rest_framework/utils/formatting.py
+++ b/rest_framework/utils/formatting.py
@@ -45,14 +45,17 @@ def _camelcase_to_spaces(content):
     return ' '.join(content.split('_')).title()
 
 
-def get_view_name(cls):
+def get_view_name(cls, suffix=None):
     """
     Return a formatted name for an `APIView` class or `@api_view` function.
     """
     name = cls.__name__
     name = _remove_trailing_string(name, 'View')
     name = _remove_trailing_string(name, 'ViewSet')
-    return _camelcase_to_spaces(name)
+    name = _camelcase_to_spaces(name)
+    if suffix:
+        name += ' ' + suffix
+    return name
 
 
 def get_view_description(cls, html=False):