diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-10-29 19:45:09 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-10-29 19:45:09 +0100 |
| commit | cf23a5dedaec67a3c34f6e4c3829f17fe8a054d0 (patch) | |
| tree | fc0bbda4aeb9d5b70e42c76386e484c22d26cd6f /addons/web/static/src/js/openerpframework.js | |
| parent | 8481fab1b1b3762f73ba5b472e12b702680144c2 (diff) | |
| parent | 92c7874eb8f4cf14c04d4d7b50853d56aef30436 (diff) | |
[MERGE] forward port of branch 8.0 up to 92c7874
Diffstat (limited to 'addons/web/static/src/js/openerpframework.js')
| -rw-r--r-- | addons/web/static/src/js/openerpframework.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js index b112783793f..fb5ae0d200a 100644 --- a/addons/web/static/src/js/openerpframework.js +++ b/addons/web/static/src/js/openerpframework.js @@ -1068,11 +1068,11 @@ openerp.Session = openerp.Class.extend(openerp.PropertiesMixin, { }, check_session_id: function() { var self = this; - if (this.avoid_recursion || self.use_cors) + if (this.avoid_recursion) return $.when(); if (this.session_id) return $.when(); // we already have the session id - if (this.override_session || ! this.origin_server) { + if (!this.use_cors && (this.override_session || ! this.origin_server)) { // If we don't use the origin server we consider we should always create a new session. // Even if some browsers could support cookies when using jsonp that behavior is // not consistent and the browser creators are tending to removing that feature. |