diff options
| author | Christophe Simonis <chs@openerp.com> | 2011-12-16 15:17:07 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2011-12-16 15:17:07 +0100 |
| commit | d3960997ea9e5499bb50cb6396debb81fe5603bc (patch) | |
| tree | 1dfe1109bcfabefc4f699282b5ad92e956fb78a2 /addons/web/static/src | |
| parent | 03a86e7bb62c5a12d3914f5cda6b3b187277f77b (diff) | |
[FIX] login after database creation
bzr revid: chs@openerp.com-20111216141707-f9a26e1kjz3f7unt
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/core.js | 5 |
2 files changed, 7 insertions, 2 deletions
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 */ |
