Skip to content

Commit

Permalink
[2.1.x] Added ModelAdmin._response_post_save() to avoid code duplicat…
Browse files Browse the repository at this point in the history
…ion.

Backport of 57f1665 from master
  • Loading branch information
jdufresne authored and timgraham committed Aug 17, 2018
1 parent f5fbff0 commit 91d281c
Showing 1 changed file with 9 additions and 17 deletions.
26 changes: 9 additions & 17 deletions django/contrib/admin/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -1322,11 +1322,7 @@ def response_change(self, request, obj):
self.message_user(request, msg, messages.SUCCESS)
return self.response_post_save_change(request, obj)

def response_post_save_add(self, request, obj):
"""
Figure out where to redirect after the 'Save' button has been pressed
when adding a new object.
"""
def _response_post_save(self, request, obj):
opts = self.model._meta
if self.has_change_permission(request, None):
post_url = reverse('admin:%s_%s_changelist' %
Expand All @@ -1339,23 +1335,19 @@ def response_post_save_add(self, request, obj):
current_app=self.admin_site.name)
return HttpResponseRedirect(post_url)

def response_post_save_add(self, request, obj):
"""
Figure out where to redirect after the 'Save' button has been pressed
when adding a new object.
"""
return self._response_post_save(request, obj)

def response_post_save_change(self, request, obj):
"""
Figure out where to redirect after the 'Save' button has been pressed
when editing an existing object.
"""
opts = self.model._meta

if self.has_change_permission(request, None):
post_url = reverse('admin:%s_%s_changelist' %
(opts.app_label, opts.model_name),
current_app=self.admin_site.name)
preserved_filters = self.get_preserved_filters(request)
post_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, post_url)
else:
post_url = reverse('admin:index',
current_app=self.admin_site.name)
return HttpResponseRedirect(post_url)
return self._response_post_save(request, obj)

def response_action(self, request, queryset):
"""
Expand Down

0 comments on commit 91d281c

Please sign in to comment.