Make breadcrumbs show specific parents when they exist

setup.py

@@ -26,7 +26,7 @@
     long_description=long_description,
     long_description_content_type='text/markdown',
     license='CC0',
-    version='1.0.2',
+    version='1.0.3',
     include_package_data=True,
     packages=find_packages(),
     package_data={

treemodeladmin/helpers.py

@@ -20,7 +20,8 @@ def get_index_url_with_parent(self, parent_field, parent_pk):
             parent_pk=quote(parent_pk)
         )
 
-    def crumb(self, parent_field=None, parent_instance=None):
+    def crumb(self, parent_field=None, parent_instance=None,
+              specific_instance=None):
         if parent_field is not None and parent_instance is not None:
             index_url = self.get_index_url_with_parent(
                 parent_field,
@@ -29,9 +30,14 @@ def crumb(self, parent_field=None, parent_instance=None):
         else:
             index_url = self.index_url
 
+        if specific_instance is not None:
+            crumb_text = force_text(specific_instance)
+        else:
+            crumb_text = force_text(self.opts.verbose_name_plural)
+
         return (
             index_url,
-            force_text(self.opts.verbose_name_plural)
+            crumb_text
         )
 
 

treemodeladmin/tests/test_views.py

@@ -43,6 +43,26 @@ def test_breadcrumbs(self):
         )
 
 
+class TestAuthorCreateView(TestCase, WagtailTestUtils):
+    fixtures = ['treemodeladmin_test.json']
+
+    def setUp(self):
+        self.user = self.login()
+
+    def post(self, post_data):
+        return self.client.post('/admin/treemodeladmintest/author/create/',
+                                post_data)
+
+    def test_create_redirects_to_plain_index(self):
+        response = self.post({
+            'name': 'P. G. Wodehouse',
+        })
+
+        # Should redirect back to
+        self.assertRedirects(response,
+                             '/admin/treemodeladmintest/author/')
+
+
 class TestBookIndexView(TestCase, WagtailTestUtils):
     fixtures = ['treemodeladmin_test.json']
 
@@ -95,7 +115,7 @@ def test_breadcrumbs_with_parent(self):
         self.assertEqual(
             list(resposne.context['view'].breadcrumbs),
             [
-                ('/admin/treemodeladmintest/author/', 'authors'),
+                ('/admin/treemodeladmintest/author/', 'J. R. R. Tolkien'),
                 ('/admin/treemodeladmintest/book/?author=1', 'books')
             ]
         )
@@ -234,8 +254,9 @@ def test_breadcrumbs_with_parents(self):
         self.assertEqual(
             list(resposne.context['view'].breadcrumbs),
             [
-                ('/admin/treemodeladmintest/author/', 'authors'),
-                ('/admin/treemodeladmintest/book/?author=1', 'books'),
+                ('/admin/treemodeladmintest/author/', 'J. R. R. Tolkien'),
+                ('/admin/treemodeladmintest/book/?author=1',
+                 'The Lord of the Rings'),
                 ('/admin/treemodeladmintest/volume/?book=1', 'volumes')
             ]
         )

treemodeladmin/views.py

@@ -57,6 +57,7 @@ def parent_instance(self):
     @property
     def breadcrumbs(self):
         parent_instance = self.parent_instance
+        specific_instance = None
         model_admin = self.model_admin
 
         breadcrumbs = []
@@ -65,12 +66,14 @@ def breadcrumbs(self):
             breadcrumbs.append(
                 model_admin.url_helper.crumb(
                     parent_field=model_admin.parent_field,
-                    parent_instance=parent_instance
+                    parent_instance=parent_instance,
+                    specific_instance=specific_instance
                 )
             )
 
             if model_admin.has_parent():
                 model_admin = model_admin.parent
+                specific_instance = parent_instance
                 parent_instance = getattr(
                     parent_instance,
                     model_admin.parent_field,