diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-19 16:13:35 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-19 16:13:35 +0200 |
| commit | adf07a9490436211d16da8b1355c3bae4448a54a (patch) | |
| tree | ceab9f348148bd97729209cde4cc892ea1b195a7 /addons/auth_oauth/controllers/main.py | |
| parent | 6618a9a1e5067444eedba4ac3c5c3c843a74798c (diff) | |
| parent | 5087612d1da85a8661f7aa124969b2ee9e155c10 (diff) | |
[MERGE] forward port of branch saas-4 up to 5087612
Diffstat (limited to 'addons/auth_oauth/controllers/main.py')
| -rw-r--r-- | addons/auth_oauth/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 99f134a5cbd..7652420d7c6 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -74,7 +74,7 @@ class OAuthLogin(Home): state = dict( d=request.session.db, p=provider['id'], - r=redirect, + r=werkzeug.url_quote_plus(redirect), ) token = request.params.get('token') if token: @@ -143,7 +143,7 @@ class OAuthController(http.Controller): cr.commit() action = state.get('a') menu = state.get('m') - redirect = state.get('r') + redirect = werkzeug.url_unquote_plus(state['r']) if state.get('r') else False url = '/web' if redirect: url = redirect |