diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 50fb8018918..d2b8a5a20fc 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -597,8 +597,8 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ */ do_login: function (db, login, password) { var self = this; - this.session.session_authenticate(db, login, password, function() { - if(self.session.session_is_valid()) { + this.session.session_authenticate(db, login, password).then(function() { + if(self.session.is_valid()) { if (self.has_local_storage) { if(self.remember_credentials) { localStorage.setItem('last_db_login_success', db); diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index aa29373ce17..2c3f9d3793b 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -558,6 +558,11 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. return deferred; }); }, + + is_valid: function() { + return !!this.uid; + }, + /** * The session is validated either by login or by restoration of a previous session */