Ticket #4413: remember_change_list_params.diff

main.py

@@ -105 +105 @@
                 break
     return js
 
+def list_params_recall_key(model):
+    return "%s.%s.last_params"  % (model._meta.app_label, model.__class__.__name__)
+
 class AdminBoundField(object):
     def __init__(self, field, field_mapping, original):
         self.field = field
@@ -357 +360 @@
                 return HttpResponseRedirect("../add/")
             else:
                 request.user.message_set.create(message=msg)
-                return HttpResponseRedirect("../")
+                last_params_key = list_params_recall_key(model)
+                print "last_params_key is %s" % repr(last_params_key)
+                if last_params_key in request.session:
+                    print "got last_params, it was %s" % repr(request.session[last_params_key])
+                    last_params = request.session[last_params_key].items()
+                    page = "?%s" % "&".join(["%s=%s" % kv for kv in last_params])
+                    print "page is %s" % repr(page)
+                else:
+                    print "no last_page_key."
+                    page = ""
+                return HttpResponseRedirect("../%s" % page)
     else:
         # Populate new_data with a "flattened" version of the current data.
         new_data = manipulator.flatten_data()
@@ -558 +571 @@
             self.page_num = int(request.GET.get(PAGE_VAR, 0))
         except ValueError:
             self.page_num = 0
+
+
+
         self.show_all = ALL_VAR in request.GET
         self.is_popup = IS_POPUP_VAR in request.GET
         self.params = dict(request.GET.items())
-        if PAGE_VAR in self.params:
-            del self.params[PAGE_VAR]
+
         if ERROR_FLAG in self.params:
             del self.params[ERROR_FLAG]
 
+        # Remember which page the user was on (hackish)
+        request.session[list_params_recall_key(model)] = self.params.copy()
+
+        if PAGE_VAR in self.params:
+            del self.params[PAGE_VAR]
+
+
+
         self.order_field, self.order_type = self.get_ordering()
         self.query = request.GET.get(SEARCH_VAR, '')
         self.query_set = self.get_query_set()