diff options
| author | Fabien Meghazi <fme@openerp.com> | 2013-03-05 11:51:12 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2013-03-05 11:51:12 +0100 |
| commit | 96ddbcd2c7bc0d94c0e20848c0df070067a2c0b9 (patch) | |
| tree | c367e991a616305fa9297d1782e28c0079984864 /addons/web/static | |
| parent | de658646e091153f97aaafc3e845d7bf69f7444b (diff) | |
[FIX] Make 'remember credential' option work with --no-database-list
bzr revid: fme@openerp.com-20130305105112-6d5q0qyxw1p2k9d6
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index a14153fc8f5..91adfad9ebd 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -633,7 +633,17 @@ instance.web.Login = instance.web.Widget.extend({ if (self.params.db && self.params.login && self.params.password) { d = self.do_login(self.params.db, self.params.login, self.params.password); } else { - d = self.rpc("/web/database/get_list", {}).done(self.on_db_loaded).fail(self.on_db_failed); + d = self.rpc("/web/database/get_list", {}) + .done(self.on_db_loaded) + .fail(self.on_db_failed) + .always(function() { + if (self.selected_db && self.has_local_storage && self.remember_credentials) { + self.$("[name=login]").val(localStorage.getItem(self.selected_db + '|last_login') || ''); + if (self.session.debug) { + self.$("[name=password]").val(localStorage.getItem(self.selected_db + '|last_password') || ''); + } + } + }); } return d; }, @@ -652,6 +662,7 @@ instance.web.Login = instance.web.Widget.extend({ params.db = db; this.remember_last_used_database(db); this.$('.oe_login_dbpane').empty().text(_t('Loading...')); + this.$('[name=login], [name=password]').prop('readonly', true); window.location = '/?' + $.param(params); }, on_db_loaded: function (result) { @@ -668,12 +679,6 @@ instance.web.Login = instance.web.Widget.extend({ } else { this.$('div.oe_login_dbpane').show(); } - if (this.has_local_storage && this.remember_credentials) { - this.$("[name=login]").val(localStorage.getItem(this.selected_db + '|last_login') || ''); - if (this.session.debug) { - this.$("[name=password]").val(localStorage.getItem(this.selected_db + '|last_password') || ''); - } - } }, on_db_failed: function (error, event) { if (error.data.fault_code === 'AccessDenied') { |