diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-03-12 16:29:42 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-03-12 16:29:42 +0100 |
| commit | a8f513f4f24ad257dac8b6cad3c27cde2c537cb7 (patch) | |
| tree | a77376eb789ab455a1eb9cdf00bdf8b314549417 /addons/auth_oauth | |
| parent | 2ed053642abfbf20678c02955b8b0bb575cf8d30 (diff) | |
| parent | 5bf16082786c647dfd322a3157305f750c070136 (diff) | |
[MERGE] upstream
bzr revid: fme@openerp.com-20140312152942-egbzui0drs85wt7i
Diffstat (limited to 'addons/auth_oauth')
| -rw-r--r-- | addons/auth_oauth/controllers/main.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index a338927c3a1..6d28813507c 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.pathname) { + r = '/'; + } window.location = r; </script></head><body></body></html>""" return func(self, *a, **kw) return wrapper + #---------------------------------------------------------- # Controller #---------------------------------------------------------- @@ -91,6 +96,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): return response + class OAuthController(http.Controller): @http.route('/auth_oauth/signin', type='http', auth='none') |