diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-08-22 22:34:06 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-08-22 22:34:06 +0530 |
| commit | 70cc6eb8f383dcc97aeac22216a9da0d65a09085 (patch) | |
| tree | 7f9d646002f2e6db763b1b3e89d9762efb12a544 /mediagoblin/user_pages/views.py | |
| parent | e018b2120ac4131afab6611c84f8cfbe0926e640 (diff) | |
| parent | e7b8059f17c98ee88d933af52b0c4d858e882e8e (diff) | |
| download | mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.lz mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.xz mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.zip | |
Resolve merge conflict and merge.
Diffstat (limited to 'mediagoblin/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 85cea47f..87d0034e 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -319,8 +319,12 @@ def media_confirm_delete(request): messages.add_message( request, messages.SUCCESS, _('You deleted the media.')) - return redirect(request, "mediagoblin.user_pages.user_home", - user=username) + location = media.url_to_next(request.urlgen) + if not location: + location=media.url_to_prev(request.urlgen) + if not location: + location="mediagoblin.user_pages.user_home" + return redirect(request, location=location, user=username) else: messages.add_message( request, messages.ERROR, |