pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to 31c1be1fac

Browse Source
This commit is contained in:
Christophe Simonis
2017-10-20 16:02:12 +02:00
parent 786b67ab49 31c1be1fac
commit e2532f855f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auth_oauth/controllers/main.py
+6 -1
View File
@@ -6,6 +6,7 @@ import logging
import json import json
import werkzeug.urls
import werkzeug.utils import werkzeug.utils
from werkzeug.exceptions import BadRequest from werkzeug.exceptions import BadRequest
@@ -148,7 +149,11 @@ class OAuthController(http.Controller):
url = '/web#action=%s' % action url = '/web#action=%s' % action
elif menu: elif menu:
url = '/web#menu_id=%s' % menu url = '/web#menu_id=%s' % menu
return login_and_redirect(*credentials, redirect_url=url) resp = login_and_redirect(*credentials, redirect_url=url)
# Since /web is hardcoded, verify user has right to land on it
if werkzeug.urls.url_parse(resp.location).path == '/web' and not request.env.user.has_group('base.group_user'):
resp.location = '/'
return resp
except AttributeError: except AttributeError:
# auth_signup is not installed # auth_signup is not installed
_logger.error("auth_signup not installed on database %s: oauth sign up cancelled." % (dbname,)) _logger.error("auth_signup not installed on database %s: oauth sign up cancelled." % (dbname,))