summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-01-21 15:00:55 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-01-21 15:00:55 +0100
commitc3eb55c7ddcfb00e836eb136ac8e6f3935d92588 (patch)
treee905f08ef67b14b6bbbb9ea07a4f9e8e092c3f4e
parentd1dad918bb5cb3e70d72d6ad0b8a659fdcc26266 (diff)
downloadIshtar-c3eb55c7ddcfb00e836eb136ac8e6f3935d92588.tar.bz2
Ishtar-c3eb55c7ddcfb00e836eb136ac8e6f3935d92588.zip
Admin: preserve filters after actions
-rw-r--r--ishtar_common/admin.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index b2a3f399e..3786870d2 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -18,6 +18,7 @@
# See the file COPYING for details.
import csv
+import urllib
from ajax_select import make_ajax_form
from ajax_select.fields import AutoCompleteSelectField, \
@@ -89,7 +90,7 @@ def change_value(attribute, value, description):
'admin:%s_%s_changelist' % (
modeladmin.model._meta.app_label,
modeladmin.model._meta.model_name)
- )
+ ) + '?' + urllib.urlencode(request.GET)
return HttpResponseRedirect(url)
_change_value.short_description = description
_change_value.__name__ = str(slugify(description))
@@ -627,7 +628,7 @@ def duplicate_importertype(modeladmin, request, queryset):
'admin:%s_%s_changelist' % (
modeladmin.model._meta.app_label,
modeladmin.model._meta.model_name)
- )
+ ) + '?' + urllib.urlencode(request.GET)
return HttpResponseRedirect(url)
@@ -682,7 +683,7 @@ def duplicate_importercolumn(modeladmin, request, queryset):
'admin:%s_%s_changelist' % (
modeladmin.model._meta.app_label,
modeladmin.model._meta.model_name)
- )
+ ) + '?' + urllib.urlencode(request.GET)
return HttpResponseRedirect(url)
@@ -707,7 +708,8 @@ def shift_right(modeladmin, request, queryset):
'admin:%s_%s_changelist' % (
modeladmin.model._meta.app_label,
modeladmin.model._meta.model_name)
- )
+ ) + '?' + urllib.urlencode(request.GET)
+ # for Python 3, use urllib.parse.urlencode
return HttpResponseRedirect(url)
@@ -750,7 +752,8 @@ def shift_left(modeladmin, request, queryset):
'admin:%s_%s_changelist' % (
modeladmin.model._meta.app_label,
modeladmin.model._meta.model_name)
- )
+ ) + '?' + urllib.urlencode(request.GET)
+ # for Python 3, use urllib.parse.urlencode
return HttpResponseRedirect(url)