Skip to content

Commit

Permalink
Admin: fixed redirect on new item save (closes #231).
Browse files Browse the repository at this point in the history
  • Loading branch information
idlesign committed Sep 16, 2018
1 parent ecdbc7f commit a6f0693
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Unreleased
+ Allow custom widget for parent field in admin.
+ Dynamic tree() function now accepts custom keyword arguments.
+ Improved suppport for national characters in URIs.
* Admin: fixed redirect on new item save (closes #231).


v1.11.0
Expand Down
27 changes: 17 additions & 10 deletions sitetree/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,20 @@ def formfield_for_manytomany(self, db_field, request=None, **kwargs):

return super(TreeItemAdmin, self).formfield_for_manytomany(db_field, request=request, **kwargs)

def _redirect(self, request, response):
"""Generic redirect for item editor."""

if '_addanother' in request.POST:
return HttpResponseRedirect('../item_add/')

elif '_save' in request.POST:
return HttpResponseRedirect('../')

elif '_continue' in request.POST:
return response

return HttpResponseRedirect('')

def response_add(self, request, obj, post_url_continue=None, **kwargs):
"""Redirects to the appropriate items' 'continue' page on item add.
Expand All @@ -133,7 +147,8 @@ def response_add(self, request, obj, post_url_continue=None, **kwargs):
"""
if post_url_continue is None:
post_url_continue = '../item_%s/' % obj.pk
return super(TreeItemAdmin, self).response_add(request, obj, post_url_continue)

return self._redirect(request, super(TreeItemAdmin, self).response_add(request, obj, post_url_continue))

def response_change(self, request, obj, **kwargs):
"""Redirects to the appropriate items' 'add' page on item change.
Expand All @@ -142,15 +157,7 @@ def response_change(self, request, obj, **kwargs):
should make some changes to redirection process.
"""
response = super(TreeItemAdmin, self).response_change(request, obj)
if '_addanother' in request.POST:
return HttpResponseRedirect('../item_add/')
elif '_save' in request.POST:
return HttpResponseRedirect('../')
elif '_continue' in request.POST:
return response
else:
return HttpResponseRedirect('')
return self._redirect(request, super(TreeItemAdmin, self).response_change(request, obj))

def get_form(self, request, obj=None, **kwargs):
"""Returns modified form for TreeItem model.
Expand Down

0 comments on commit a6f0693

Please sign in to comment.