diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-02-10 18:41:06 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-02-10 18:41:06 +0100 |
| commit | a282d4ae7f27869a0b828e8562f8efd901e02799 (patch) | |
| tree | 1fa369ee7526a0a7ccee075f0d8232d2f4fac870 /addons/web/static/src/js/framework | |
| parent | b229e9cb8c1fdc83a1aa5abd51141e32aea59bcd (diff) | |
| parent | be9dfb331f90bd0352728c78e115bc3647f472e9 (diff) | |
[MERGE] forward port branch saas-14 up to be9dfb331f9
Diffstat (limited to 'addons/web/static/src/js/framework')
| -rw-r--r-- | addons/web/static/src/js/framework/session.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js index 6af97721926..516436af93c 100644 --- a/addons/web/static/src/js/framework/session.js +++ b/addons/web/static/src/js/framework/session.js @@ -86,8 +86,11 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, { * Init a session, reloads from cookie, if it exists */ session_init: function () { + var def = this.session_reload(); + if (this.is_frontend) return def; + var self = this; - return this.session_reload().then(function() { + return def.then(function() { var modules = self.module_list.join(','); var deferred = self.load_qweb(modules); if(self.session_is_valid()) { |