From 342974f2205566ab3d97e9d7589cac0ad94f7aeb Mon Sep 17 00:00:00 2001 From: Mathieu Pillard Date: Thu, 12 Jul 2012 18:22:03 +0200 Subject: [PATCH] Fix for django 1.4 compatibility - form_url is now an expected keyword argument to change_view(). --- admin_tabs/helpers.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/admin_tabs/helpers.py b/admin_tabs/helpers.py index 9d91b65..53fca7a 100644 --- a/admin_tabs/helpers.py +++ b/admin_tabs/helpers.py @@ -340,12 +340,17 @@ def get_form(self, request, obj=None, **kwargs): @csrf_protect_m @transaction.commit_on_success - def change_view(self, request, object_id, extra_context=None): + def change_view(self, request, object_id, form_url='', extra_context=None): if extra_context is None: extra_context = {} page_config = self.get_page_config(request, obj_or_id=object_id) extra_context.update({'page_config': page_config}) - return super(TabbedModelAdmin, self).change_view(request, object_id, extra_context) + try: + # django 1.4 + return super(TabbedModelAdmin, self).change_view(request, object_id, form_url=form_url, extra_context=extra_context) + except TypeError: + # django 1.3 + return super(TabbedModelAdmin, self).change_view(request, object_id, extra_context=extra_context) @csrf_protect_m @transaction.commit_on_success @@ -354,5 +359,5 @@ def add_view(self, request, form_url='', extra_context=None): extra_context = {} page_config = self.get_page_config(request) extra_context.update({'page_config': page_config}) - return super(TabbedModelAdmin, self).add_view(request, form_url, extra_context) + return super(TabbedModelAdmin, self).add_view(request, form_url=form_url, extra_context=extra_context)