Merge pull request #195 from treyhunner/allow-deleted-history-page

Add history listing of deleted objects

Author: macro1

.travis.yml

@@ -1,5 +1,7 @@
 language: python
 
+sudo: false
+
 python:
   - 2.6
   - 2.7
@@ -13,7 +15,7 @@ env:
   - DJANGO="Django>=1.8,<1.9"
 
 install:
-  - pip install -U coverage codecov $DJANGO
+  - pip install -U 'coverage<4' codecov $DJANGO
   - python -c 'from __future__ import print_function; import django; print("Django " + django.get_version())'
 
 script: coverage run setup.py test

CHANGES.rst

@@ -1,6 +1,10 @@
 Changes
 =======
 
+tip (unreleased)
+----------------
+- Add ability to list history in admin when the object instance is deleted. (gh-72)
+
 1.6.3 (2015-07-30)
 ------------------
 - Respect `to_field` and `db_column` parameters (gh-182)

simple_history/admin.py

@@ -6,6 +6,7 @@
 from django.contrib.admin import helpers
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
+from django.http import Http404
 from django.shortcuts import get_object_or_404, render
 from django.utils.text import capfirst
 from django.utils.html import mark_safe
@@ -56,7 +57,13 @@ def history_view(self, request, object_id, extra_context=None):
         object_id = unquote(object_id)
         action_list = history.filter(**{pk_name: object_id})
         # If no history was found, see whether this object even exists.
-        obj = get_object_or_404(model, pk=object_id)
+        try:
+            obj = model.objects.get(**{pk_name: object_id})
+        except model.DoesNotExist:
+            try:
+                obj = action_list.latest('history_date').instance
+            except action_list.model.DoesNotExist:
+                raise Http404
         content_type = ContentType.objects.get_by_natural_key(
             *USER_NATURAL_KEY)
         admin_user_view = 'admin:%s_%s_change' % (content_type.app_label,

simple_history/tests/tests/test_admin.py

@@ -250,3 +250,13 @@ def test_missing_one_to_one(self):
         manager.delete()
         response = self.app.get(get_history_url(employee, 0))
         self.assertEqual(response.status_code, 200)
+
+    def test_history_deleted_instance(self):
+        """Ensure history page can be retrieved even for deleted instances"""
+        self.login()
+        employee = Employee.objects.create()
+        employee_pk = employee.pk
+        employee.delete()
+        employee.pk = employee_pk
+        response = self.app.get(get_history_url(employee))
+        self.assertEqual(response.status_code, 200)