Skip to content

Commit

Permalink
Fix for django 1.4 compatibility - form_url is now an expected keywor…
Browse files Browse the repository at this point in the history
…d argument to change_view().
  • Loading branch information
diox committed Jul 12, 2012
1 parent 822d78b commit 342974f
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions admin_tabs/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

0 comments on commit 342974f

Please sign in to comment.