Merge pull request #111 from treyhunner/allow-non-default-admin

Allow non-default admin instances

Author: treyhunner

CHANGES.rst

@@ -1,6 +1,10 @@
 Changes
 =======
 
+tip (unreleased)
+----------------
+- Removed some incompatibilities with non-default admin sites (gh-92)
+
 1.5.0 (2014-08-17)
 ------------------
 - Extended availability of the ``as_of`` method to models as well as instances.

simple_history/admin.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-from django import template
 from django.core.exceptions import PermissionDenied
 try:
     from django.conf.urls import patterns, url
@@ -10,7 +9,7 @@
 from django.contrib.admin import helpers
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
-from django.shortcuts import get_object_or_404, render_to_response
+from django.shortcuts import get_object_or_404, render
 from django.contrib.admin.util import unquote
 from django.utils.text import capfirst
 from django.utils.html import mark_safe
@@ -75,10 +74,8 @@ def history_view(self, request, object_id, extra_context=None):
             'admin_user_view': admin_user_view
         }
         context.update(extra_context or {})
-        context_instance = template.RequestContext(
-            request, current_app=self.admin_site.name)
-        return render_to_response(self.object_history_template, context,
-                                  context_instance=context_instance)
+        return render(request, template_name=self.object_history_template,
+                      dictionary=context, current_app=self.admin_site.name)
 
     def history_form_view(self, request, object_id, version_id):
         original_model = self.model
@@ -166,12 +163,8 @@ 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_instance = template.RequestContext(
-            request,
-            current_app=self.admin_site.name,
-        )
-        return render_to_response(self.object_history_form_template, context,
-                                  context_instance)
+        return render(request, template_name=self.object_history_form_template,
+                      dictionary=context, current_app=self.admin_site.name)
 
     def save_model(self, request, obj, form, change):
         """Set special model attribute to user for reference after save"""

simple_history/models.py

@@ -162,6 +162,7 @@ def get_extra_fields(self, model, fields):
 
         @models.permalink
         def revert_url(self):
+            """URL for this change in the default admin site."""
             opts = model._meta
             try:
                 app_label, model_name = opts.app_label, opts.module_name

simple_history/templates/simple_history/object_history.html

@@ -1,6 +1,7 @@
 {% extends "admin/object_history.html" %}
 {% load i18n %}
 {% load url from future %}
+{% load admin_urls %}
 
 
 {% block content %}
@@ -22,12 +23,17 @@
           <tbody>
             {% for action in action_list %}
               <tr>
-                <td><a href="{{ action.revert_url }}">{{ action.history_object }}</a></td>
+                <td><a href="{% url opts|admin_urlname:'simple_history' object.pk action.pk %}">{{ action.history_object }}</a></td>
                 <td>{{ action.history_date }}</td>
                 <td>{{ action.get_history_type_display }}</td>
                 <td>
                   {% if action.history_user %}
-                    <a href="{% url admin_user_view action.history_user_id %}">{{ action.history_user }}</a>
+                    {% url admin_user_view action.history_user_id as admin_user_url %}
+                    {% if admin_user_url %}
+                      <a href="{{ admin_user_url }}">{{ action.history_user }}</a>
+                    {% else %}
+                      {{ action.history_user }}
+                    {% endif %}
                   {% else %}
                     None
                   {% endif %}

simple_history/tests/other_admin.py

@@ -0,0 +1,7 @@
+from django.contrib.admin.sites import AdminSite
+from simple_history.admin import SimpleHistoryAdmin
+from .models import State
+
+site = AdminSite(name="other_admin")
+
+site.register(State, SimpleHistoryAdmin)

simple_history/tests/tests/test_admin.py

@@ -11,24 +11,28 @@
 from django.contrib.admin.util import quote
 from django.conf import settings
 
-from ..models import Book, Person, Poll
+from ..models import Book, Person, Poll, State
 
 
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)
 
 
-def get_history_url(model, history_index=None):
+def get_history_url(obj, history_index=None, site="admin"):
     try:
-        info = model._meta.app_label, model._meta.module_name
+        app, model = obj._meta.app_label, obj._meta.module_name
     except AttributeError:
-        info = model._meta.app_label, model._meta.model_name
+        app, model = obj._meta.app_label, obj._meta.model_name
     if history_index is not None:
-        history = model.history.order_by('history_id')[history_index]
-        return reverse('admin:%s_%s_simple_history' % info,
-                       args=[quote(model.pk), quote(history.history_id)])
+        history = obj.history.order_by('history_id')[history_index]
+        return reverse(
+            "{site}:{app}_{model}_simple_history".format(
+                site=site, app=app, model=model),
+            args=[quote(obj.pk), quote(history.history_id)],
+        )
     else:
-        return reverse('admin:%s_%s_history' % info, args=[quote(model.pk)])
+        return reverse("{site}:{app}_{model}_history".format(
+            site=site, app=app, model=model), args=[quote(obj.pk)])
 
 
 class AdminSiteTest(WebTest):
@@ -181,3 +185,16 @@ def test_middleware_saves_user(self):
             self.assertEqual(historical_poll.history_user, self.user,
                              "Middleware should make the request available to "
                              "retrieve history_user.")
+
+    def test_other_admin(self):
+        """Test non-default admin instances.
+
+        Make sure non-default admin instances can resolve urls and
+        render pages.
+        """
+        self.login()
+        state = State.objects.create()
+        history_url = get_history_url(state, site="other_admin")
+        self.app.get(history_url)
+        change_url = get_history_url(state, 0, site="other_admin")
+        self.app.get(change_url)

simple_history/tests/urls.py

@@ -6,9 +6,11 @@
     from django.conf.urls.defaults import patterns, include, url
 
 from django.contrib import admin
+from . import other_admin
+
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
-)
+    url(r'^other-admin/', include(other_admin.site.urls)),
+]