Merge pull request #7 from lddubeau/bugfix/quarantine-deletion-bug

This change prevents http://dev.modoboa.org/issues/464 from happening.
This commit is contained in:
Antoine Nguyen
2013-08-30 05:32:46 -07:00
+10 -6
View File
@@ -19,14 +19,18 @@ from sql_listing import *
def __get_current_url(request):
params = []
if "page" in request.session:
res = "listing?page=%s" % request.session["page"]
res = "listing"
params.append("page=%s" % request.session["page"])
else:
res = ""
params = "&".join(map(lambda p: "%s=%s" % (p, request.session[p]),
filter(request.session.has_key, ["criteria", "pattern"])))
if params != "":
res += "?%s" % (params)
res = "listing"
params += map(lambda p: "%s=%s" % (p, request.session[p]),
filter(request.session.has_key, ["criteria", "pattern"]))
if len(params):
res += "?%s" % ("&".join(params))
return res