Honor a custom admin site_header in the listing and details pages. (#448)

Author: tbeadle

AUTHORS.rst

@@ -51,6 +51,7 @@ Authors
 - Ross Rogers
 - Steven Klass
 - Steeve Chailloux
+- Tommy Beadle (@tbeadle)
 - Trey Hunner
 - Ulysses Vilela
 - vnagendra

CHANGES.rst

@@ -2,8 +2,9 @@ Changes
 =======
 
 Unreleased
------------
+----------
 - Add `custom_model_name` parameter to the constructor of `HistoricalRecords` (gh-451)
+- Fix header on history pages when custom site_header is used (gh-448)
 
 2.5.1 (2018-10-19)
 ------------------

simple_history/admin.py

@@ -84,6 +84,7 @@ def history_view(self, request, object_id, extra_context=None):
             'admin_user_view': admin_user_view,
             'history_list_display': history_list_display,
         }
+        context.update(self.admin_site.each_context(request))
         context.update(extra_context or {})
         extra_kwargs = {}
         return render(request, self.object_history_template, context,
@@ -189,6 +190,7 @@ def history_form_view(self, request, object_id, version_id):
             'save_on_top': self.save_on_top,
             'root_path': getattr(self.admin_site, 'root_path', None),
         }
+        context.update(self.admin_site.each_context(request))
         extra_kwargs = {}
         return render(request, self.object_history_form_template, context,
                       **extra_kwargs)

simple_history/tests/tests/test_admin.py

@@ -467,6 +467,7 @@ def test_history_form_view_without_getting_history(self):
             'save_on_top': admin.save_on_top,
             'root_path': getattr(admin_site, 'root_path', None),
         }
+        context.update(admin_site.each_context(request))
         mock_render.assert_called_once_with(
             request, admin.object_history_form_template, context)
 
@@ -522,6 +523,7 @@ def test_history_form_view_getting_history(self):
             'save_on_top': admin.save_on_top,
             'root_path': getattr(admin_site, 'root_path', None),
         }
+        context.update(admin_site.each_context(request))
         mock_render.assert_called_once_with(
             request, admin.object_history_form_template, context)
 
@@ -576,6 +578,7 @@ def test_history_form_view_getting_history_with_setting_off(self):
             'save_on_top': admin.save_on_top,
             'root_path': getattr(admin_site, 'root_path', None),
         }
+        context.update(admin_site.each_context(request))
         mock_render.assert_called_once_with(
             request, admin.object_history_form_template, context)
 
@@ -632,5 +635,6 @@ def test_history_form_view_getting_history_abstract_external(self):
             'save_on_top': admin.save_on_top,
             'root_path': getattr(admin_site, 'root_path', None),
         }
+        context.update(admin_site.each_context(request))
         mock_render.assert_called_once_with(
             request, admin.object_history_form_template, context)