Merge branch 'master' into 422-add-history-extra-fields

Author: kseever

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)
 - Modify `pre_create_historircal_record` to pass `history_instance` for ease of customization (gh-421)
 
 2.5.1 (2018-10-19)

docs/advanced.rst

@@ -121,7 +121,7 @@ There are three documented ways to attach users to a tracked change:
 User instance that made the request as the ``history_user`` on the history
 table.
 
-2. Use ``simple_history.admin.SimpleHistoryAdmin`. Under the hood,
+2. Use ``simple_history.admin.SimpleHistoryAdmin``. Under the hood,
 ``SimpleHistoryAdmin`` actually sets the ``_history_user`` on the object to
 attach the user to the tracked change by overriding the `save_model` method.
 

runtests.py

@@ -25,6 +25,7 @@
     'django.contrib.auth',
     'django.contrib.sessions',
     'django.contrib.admin',
+    'django.contrib.messages',
 ]
 
 DEFAULT_SETTINGS = dict(
@@ -45,6 +46,7 @@
         'OPTIONS': {
             'context_processors': [
                 'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
             ]
         },
     }],

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/models.py

@@ -442,9 +442,13 @@ def diff_against(self, old_history):
 
         changes = []
         changed_fields = []
+        instance_fields = [field.name for field in self.instance._meta.fields]
+        old_instance_fields = [
+            field.name for field in old_history.instance._meta.fields
+        ]
         for field in self._meta.fields:
-            if hasattr(self.instance, field.name) and \
-               hasattr(old_history.instance, field.name):
+            if field.name in instance_fields and \
+               field.name in old_instance_fields:
                 old_value = getattr(old_history, field.name, '')
                 new_value = getattr(self, field.name)
                 if old_value != new_value:

simple_history/tests/tests/test_admin.py

@@ -194,7 +194,7 @@ def test_history_user_on_save_in_admin(self):
         self.assertEqual(Poll.history.get().history_user, self.user)
 
         # Ensure polls saved on edit page in admin interface save correct user
-        change_page = changelist_page.click("Poll object")
+        change_page = changelist_page.click("Poll object", index=1)
         change_page.form.submit()
         self.assertEqual([p.history_user for p in Poll.history.all()],
                          [self.user, self.user])
@@ -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)