odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Make credential autocomplete per database 

bzr revid: fme@openerp.com-20130228173444-th4grlsz70lewf9h
This commit is contained in:
Fabien Meghazi 2013-02-28 18:34:44 +01:00
parent 686e919b8d
commit 02d4ab6597
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/web/controllers/main.py
View File

@ -85,7 +85,6 @@ def rjsmin(script):
return result
def db_list(req):
return ['v7bis']
proxy = req.session.proxy("db")
dbs = proxy.list()
h = req.httprequest.environ['HTTP_HOST'].split(':')[0]

29
addons/web/static/src/js/chrome.js
View File

@ -604,14 +604,6 @@ instance.web.Login = instance.web.Widget.extend({
if (this.params.login_successful) {
this.on('login_successful', this, this.params.login_successful);
}
if (this.has_local_storage && this.remember_credentials) {
this.selected_db = localStorage.getItem('last_db_login_success');
this.selected_login = localStorage.getItem('last_login_login_success');
if (jQuery.deparam(jQuery.param.querystring()).debug !== undefined) {
this.selected_password = localStorage.getItem('last_password_login_success');
}
}
},
start: function() {
var self = this;
@ -671,6 +663,12 @@ 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') {
@ -704,17 +702,10 @@ instance.web.Login = instance.web.Widget.extend({
self.$(".oe_login_pane").fadeOut("slow");
return this.session.session_authenticate(db, login, password).then(function() {
self.remember_last_used_database(db);
if (self.has_local_storage) {
if(self.remember_credentials) {
localStorage.setItem('last_db_login_success', db);
localStorage.setItem('last_login_login_success', login);
if (jQuery.deparam(jQuery.param.querystring()).debug !== undefined) {
localStorage.setItem('last_password_login_success', password);
}
} else {
localStorage.setItem('last_db_login_success', '');
localStorage.setItem('last_login_login_success', '');
localStorage.setItem('last_password_login_success', '');
if (self.has_local_storage && self.remember_credentials) {
localStorage.setItem(db + '|last_login', login);
if (self.session.debug) {
localStorage.setItem(db + '|last_password', password);
}
}
self.trigger('login_successful');

4
addons/web/static/src/xml/base.xml
View File

@ -71,9 +71,9 @@
</div>
<ul>
<li>Username</li>
<li><input name="login" type="text" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
<li><input name="login" type="text" value="" autofocus="autofocus"/></li>
<li>Password</li>
<li><input name="password" type="password" t-att-value="widget.selected_password || ''"/></li>
<li><input name="password" type="password" value=""/></li>
<li><button name="submit">Log in</button></li>
</ul>
</form>