diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-12-08 12:28:41 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-12-08 12:28:41 +0100 |
| commit | 83a4a582faab9a6efb3afed2af5d68e4ffb4a21d (patch) | |
| tree | 98b2b2f25757527b88d240d75afcba02d925a29c /addons | |
| parent | 4ba2e91aa41ce59fcc2786ab99e9fbc7fe273bf8 (diff) | |
| parent | 513cea69c688fc4e37f26dba8880f2b683a9eae3 (diff) | |
[MERGE] forward port of branch saas-3 up to 513cea6
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/auth_oauth/controllers/main.py | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 04b2862f035..60c74eb197c 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -58,7 +58,6 @@ class OAuthLogin(Home): return_url = request.httprequest.url_root + 'auth_oauth/signin' state = self.get_state(provider) params = dict( - debug=request.debug, response_type='token', client_id=provider['client_id'], redirect_uri=return_url, diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index b08f5ca3bc9..c460cc598f0 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1119,7 +1119,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. ids = value; } new instance.web.Model(column.relation) - .call('name_get', [ids, this.dataset.context]).done(function (names) { + .call('name_get', [ids, this.dataset.get_context()]).done(function (names) { // FIXME: nth horrible hack in this poor listview record.set(column.id + '__display', _(names).pluck(1).join(', ')); |