Resolve merge conflict and merge.

2013-08-22 22:34:06 +05:30
parent e018b2120a e7b8059f17
commit 70cc6eb8f3
65 changed files with 2536 additions and 74 deletions
--- 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,