Merge pull request #43 from Amareis/issue-42

Fix Django 1.9 compatibility, Drop Django 1.4

Author: crccheck

.travis.yml

@@ -2,8 +2,6 @@ language: python
 # Generate this env list with:
 # tox -l | awk '{ print "  - TOX_ENV="$0}'
 env:
-  - TOX_ENV=django14-py26
-  - TOX_ENV=django14-py27
   - TOX_ENV=django15-py26
   - TOX_ENV=django15-py27
   - TOX_ENV=django16-py26
@@ -14,6 +12,8 @@ env:
   - TOX_ENV=django17-py34
   - TOX_ENV=django18-py27
   - TOX_ENV=django18-py34
+  - TOX_ENV=django19-py27
+  - TOX_ENV=django19-py34
   # pending full travisci support for python 3.5
   # - TOX_ENV=django18-py35
   - TOX_ENV=coveralls-django18-py27

django_object_actions/templates/django_object_actions/change_form.html

@@ -4,7 +4,7 @@
 {% block object-tools-items %}
   {% for tool in objectactions %}
     <li class="objectaction-item" data-tool-name="{{ tool.name }}">
-      <a href='tools/{{ tool.name }}/' title="{{ tool.standard_attrs.title }}"
+      <a href='{% url tools_view_name pk=object_id tool=tool.name %}' title="{{ tool.standard_attrs.title }}"
          {% for k, v in tool.custom_attrs.items %}
            {{ k }}="{{ v }}"
          {% endfor %}

django_object_actions/tests/tests.py

@@ -1,3 +1,4 @@
+from django.core.urlresolvers import reverse
 from django.test import TestCase
 
 from example_project.polls.factories import UserFactory
@@ -19,56 +20,61 @@ class AppTests(LoggedInTestCase):
 
     def test_bare_mixin_works(self):
         # hit admin that doesn't have any tools defined, just the mixin
-        response = self.client.get('/admin/polls/poll/add/')
+        response = self.client.get(reverse('admin:polls_poll_add'))
         self.assertEqual(response.status_code, 200)
 
     def test_configured_mixin_works(self):
         # hit admin that does have any tools defined
-        response = self.client.get('/admin/polls/choice/add/')
+        response = self.client.get(reverse('admin:polls_choice_add'))
         self.assertEqual(response.status_code, 200)
         self.assertIn('objectactions', response.context_data)
 
     def test_tool_func_gets_executed(self):
         c = Choice.objects.get(pk=1)
         votes = c.votes
-        response = self.client.get('/admin/polls/choice/1/tools/increment_vote/')
+        response = self.client.get(reverse('admin:polls_choice_tools', args=(1, 'increment_vote')))
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['location'].endswith('/admin/polls/choice/1/'))
+        url = reverse('admin:polls_choice_change', args=(1,))
+        self.assertTrue(response['location'].endswith(url))
         c = Choice.objects.get(pk=1)
         self.assertEqual(c.votes, votes + 1)
 
     def test_tool_can_return_httpresponse(self):
         # we know this url works because of fixtures
-        url = '/admin/polls/choice/2/tools/edit_poll/'
+        url = reverse('admin:polls_choice_tools', args=(2, 'edit_poll'))
         response = self.client.get(url)
         # we expect a redirect
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['location'].endswith('/admin/polls/poll/1/'))
+        self.assertTrue(response['location'].endswith(reverse('admin:polls_poll_change', args=(1,))))
 
     def test_can_return_template(self):
         # This is more of a test of render_to_response than the app, but I think
         # it's good to document that this is something we can do.
-        url = '/admin/polls/poll/1/tools/delete_all_choices/'
+        url = reverse('admin:polls_poll_tools', args=(1, 'delete_all_choices'))
         response = self.client.get(url)
         self.assertTemplateUsed(response, "clear_choices.html")
 
     def test_message_user_sends_message(self):
-        url = '/admin/polls/poll/1/tools/delete_all_choices/'
+        url = reverse('admin:polls_poll_tools', args=(1, 'delete_all_choices'))
         self.assertNotIn('messages', self.client.cookies)
         self.client.get(url)
         self.assertIn('messages', self.client.cookies)
 
     def test_intermediate_page_with_post_works(self):
         self.assertTrue(Choice.objects.filter(poll=1).count())
-        url = '/admin/polls/poll/1/tools/delete_all_choices/'
+        url = reverse('admin:polls_poll_tools', args=(1, 'delete_all_choices'))
         response = self.client.post(url)
         self.assertEqual(response.status_code, 302)
         self.assertEqual(Choice.objects.filter(poll=1).count(), 0)
 
     def test_undefined_tool_404s(self):
-        response = self.client.get('/admin/polls/choice/1/tools/weeeewoooooo/')
+        response = self.client.get(reverse('admin:polls_poll_tools', args=(1, 'weeeewoooooo')))
         self.assertEqual(response.status_code, 404)
 
     def test_key_error_tool_500s(self):
         self.assertRaises(KeyError, self.client.get,
-                          '/admin/polls/choice/1/tools/raise_key_error/')
+                          reverse('admin:polls_choice_tools', args=(1, 'raise_key_error')))
+
+    def test_render_button(self):
+        response = self.client.get(reverse('admin:polls_choice_change', args=(1,)))
+        self.assertEqual(response.status_code, 200)

django_object_actions/utils.py

@@ -4,6 +4,7 @@
 
 from django.conf.urls import patterns, url
 from django.contrib import messages
+from django.core.urlresolvers import reverse
 from django.db.models.query import QuerySet
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.views.generic import View
@@ -14,17 +15,28 @@ class BaseDjangoObjectActions(object):
     """ModelAdmin mixin to add object-tools just like adding admin actions."""
     # list to hold each object action tool
     objectactions = []
+    tools_view_name = None
 
-    def get_tool_urls(self):
+    def get_tool_urls(self, urls):
         """Gets the url patterns that route each tool to a special view."""
         tools = {}
+
+        end = '_change'
+        for url_pattern in urls:
+            if url_pattern.name.endswith(end):
+                tools_view = url_pattern.name[:-len(end)] + '_tools'
+                change_view = 'admin:' + url_pattern.name
+                self.tools_view_name = 'admin:' + tools_view
+                break
+
         for tool in self.objectactions:
             tools[tool] = getattr(self, tool)
         my_urls = patterns('',
             # supports pks that are numbers or uuids
             url(r'^(?P<pk>[0-9a-f\-]+)/tools/(?P<tool>\w+)/$',
                 self.admin_site.admin_view(
-                    ModelToolsView.as_view(model=self.model, tools=tools)))
+                        ModelToolsView.as_view(model=self.model, tools=tools, back=change_view)),
+                name=tools_view)
         )
         return my_urls
 
@@ -35,7 +47,7 @@ def get_tool_urls(self):
     def get_urls(self):
         """Prepends `get_urls` with our own patterns."""
         urls = super(BaseDjangoObjectActions, self).get_urls()
-        return self.get_tool_urls() + urls
+        return self.get_tool_urls(urls) + urls
 
     def render_change_form(self, request, context, **kwargs):
         """Puts `objectactions` into the context."""
@@ -55,6 +67,7 @@ def to_dict(tool_name):
             to_dict,
             self.get_object_actions(request, context, **kwargs)
         )
+        context['tools_view_name'] = self.tools_view_name
         return super(BaseDjangoObjectActions, self).render_change_form(
             request, context, **kwargs)
 
@@ -106,6 +119,7 @@ class DjangoObjectActions(BaseDjangoObjectActions):
 class ModelToolsView(SingleObjectMixin, View):
     """A special view that run the tool's callable."""
     tools = {}
+    back = None
 
     def get(self, request, **kwargs):
         # SingleOjectMixin's `get_object`. Works because the view
@@ -118,7 +132,7 @@ def get(self, request, **kwargs):
         ret = tool(request, obj)
         if isinstance(ret, HttpResponse):
             return ret
-        back = request.path.rsplit('/', 3)[0] + '/'
+        back = reverse(self.back, args=(kwargs['pk'],))
         return HttpResponseRedirect(back)
 
     # HACK to allow POST requests too easily

tox.ini

@@ -2,11 +2,11 @@
 # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
 [tox]
 envlist =
-    django14-{py26,py27},
     django15-{py26,py27},
     django16-{py26,py27,py33},
     django17-{py27,py33,py34},
     django18-{py27,py34,py35},
+    django19-{py27,py34,py35},
     # run one of the tests again but with coverage
     coveralls-django18-py27,
 skipsdist = True
@@ -21,11 +21,11 @@ deps =
     django-extensions==1.5.9
     factory-boy==2.6.0
     coveralls: coverage
-    django14: Django<1.5
     django15: Django<1.6
     django16: Django<1.7
     django17: Django<1.8
     django18: Django<1.9
+    django19: Django<1.10
 
 [testenv:coveralls-django18-py27]
 commands =