summaryrefslogtreecommitdiff
path: root/addons/web/controllers
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-08-21 17:01:17 +0200
committerChristophe Simonis <chs@odoo.com>2015-08-21 17:01:17 +0200
commitb2062df319fcf553528351c4fa7ab696e6673378 (patch)
tree9a5d2a224d038ebb809be5293b35b1828a6c0999 /addons/web/controllers
parentee0fd9765eca0cdf4394e056abe9fc30e39a755a (diff)
parent86f98d514405cdb0ec8ee25b5b3b6ae4b1c39443 (diff)
[MERGE] forward port of branch 8.0 up to 86f98d5
Diffstat (limited to 'addons/web/controllers')
-rw-r--r--addons/web/controllers/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 894faec7e51..13a856907af 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -315,7 +315,7 @@ def login_redirect():
# built the redirect url, keeping all the query parameters of the url
redirect_url = '%s?%s' % (request.httprequest.base_url, werkzeug.urls.url_encode(request.params))
return """<html><head><script>
- window.location = '%sredirect=' + encodeURIComponent("%s");
+ window.location = '%sredirect=' + encodeURIComponent("%s" + location.hash);
</script></head></html>
""" % (url, redirect_url)