diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-03-11 15:52:05 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-03-11 15:52:05 +0100 |
| commit | d504764eff52354d4993863d72d1342bcdf704fb (patch) | |
| tree | 09b0d87666f8a8e56dad86d7bc53ea092551e0e2 /addons/auth_oauth/controllers | |
| parent | 96f744b2712fe0bd6f65ac93b4d347b1559123fc (diff) | |
| parent | 3ceefde48942df95000a0b89698ee71a1187fecb (diff) | |
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
Diffstat (limited to 'addons/auth_oauth/controllers')
| -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 b62fb31d8b0..22a240e310b 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 #---------------------------------------------------------- @@ -111,6 +116,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): response.qcontext.update(providers=providers) return response + class OAuthController(http.Controller): @http.route('/auth_oauth/signin', type='http', auth='none') |