From 49a92c376aa3405cf0c836fdaab07ec69d73b647 Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Thu, 27 Feb 2014 14:07:05 +0100 Subject: [PATCH] [FIX] Fix loop when parse hash into get param with no hash bzr revid: jke@openerp.com-20140227130705-jlvl157aio3o4df3 --- addons/auth_oauth/controllers/main.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 53a6ffd5462..4d96f083cdc 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -15,6 +15,7 @@ from openerp.tools.translate import _ _logger = logging.getLogger(__name__) + #---------------------------------------------------------- # helpers #---------------------------------------------------------- @@ -30,11 +31,15 @@ def fragment_to_query_string(func): var s = l.search ? (l.search === '?' ? '' : '&') : '?'; r = l.pathname + l.search + s + q; } + if (r == l) { + r = '/'; + } window.location = r; """ return func(self, *a, **kw) return wrapper + #---------------------------------------------------------- # Controller #---------------------------------------------------------- @@ -88,6 +93,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): return response + class OAuthController(http.Controller): @http.route('/auth_oauth/signin', type='http', auth='none')