Ticket #2382: 2382.patch

contrib/admin/views/main.py

@@ -269 +269 @@
                     (pk_value, str(new_object).replace('"', '\\"')))
             elif request.POST.has_key("_addanother"):
                 request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))
-                return HttpResponseRedirect(request.path)
+                return HttpResponseRedirect(request.path + '?' + request.GET.urlencode())
             else:
                 request.user.message_set.create(message=msg)
-                return HttpResponseRedirect(post_url)
+                return HttpResponseRedirect(post_url + '?' + request.GET.urlencode())
     else:
         # Add default data.
         new_data = manipulator.flatten_data()
@@ -348 +348 @@
                 if request.REQUEST.has_key('_popup'):
                     return HttpResponseRedirect(request.path + "?_popup=1")
                 else:
-                    return HttpResponseRedirect(request.path)
+                    return HttpResponseRedirect(request.path + '?' + request.GET.urlencode())
             elif request.POST.has_key("_saveasnew"):
                 request.user.message_set.create(message=_('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': opts.verbose_name, 'obj': new_object})
-                return HttpResponseRedirect("../%s/" % pk_value)
+                return HttpResponseRedirect("../%s/" % pk_value + '?' + request.GET.urlencode())
             elif request.POST.has_key("_addanother"):
                 request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))
-                return HttpResponseRedirect("../add/")
+                return HttpResponseRedirect("../add/" + '?' + request.GET.urlencode())
             else:
                 request.user.message_set.create(message=msg)
-                return HttpResponseRedirect("../")
+                return HttpResponseRedirect("../" + '?' + request.GET.urlencode())
     else:
         # Populate new_data with a "flattened" version of the current data.
         new_data = manipulator.flatten_data()
@@ -736 +736 @@
         return qs
 
     def url_for_result(self, result):
-        return "%s/" % quote(getattr(result, self.pk_attname))
+        return "%s/" % quote(getattr(result, self.pk_attname)) + self.get_query_string()
 
 def change_list(request, app_label, model_name):
     model = models.get_model(app_label, model_name)

contrib/admin/templates/admin/change_list.html

@@ -8 +8 @@
 {% block content %}
 <div id="content-main">
 {% if has_add_permission %}
-<ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
+<ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% else %}{{ cl.get_query_string }}{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
 {% endif %}
 <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
 {% block search %}{% search_form cl %}{% endblock %}