Ticket #12241: keep_query_string_after_continue.diff

django/contrib/admin/options.py

@@ -589 +589 @@
             "admin/change_form.html"
         ], context, context_instance=context_instance)
 
+    def handle_continue_redirect(self, request, url_continue, msg):
+        self.message_user(request, msg + ' ' + _("You may edit it again below."))
+        if request.POST.has_key("_popup"):
+            url_continue += ("?_popup=1" + request.META.get('QUERY_STRING'))
+        else:
+            url_continue += ("?" + request.META.get('QUERY_STRING'))
+        return url_continue
+
     def response_add(self, request, obj, post_url_continue='../%s/'):
         """
         Determines the HttpResponse for the add_view stage.
@@ -600 +608 @@
         # Here, we distinguish between different save types by checking for
         # the presence of keys in request.POST.
         if request.POST.has_key("_continue"):
-            self.message_user(request, msg + ' ' + _("You may edit it again below."))
-            if request.POST.has_key("_popup"):
-                post_url_continue += "?_popup=1"
+            url = self.handle_continue_redirect(request, post_url_continue, msg)
             return HttpResponseRedirect(post_url_continue % pk_value)
 
         if request.POST.has_key("_popup"):
@@ -633 +639 @@
 
         msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj)}
         if request.POST.has_key("_continue"):
-            self.message_user(request, msg + ' ' + _("You may edit it again below."))
-            if request.REQUEST.has_key('_popup'):
-                return HttpResponseRedirect(request.path + "?_popup=1")
-            else:
-                return HttpResponseRedirect(request.path)
+            url = self.handle_continue_redirect(request, request.path, msg)
+            return HttpResponseRedirect(url)
         elif request.POST.has_key("_saveasnew"):
             msg = _('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': force_unicode(opts.verbose_name), 'obj': obj}
             self.message_user(request, msg)