Yogesh(Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-bug-902434-ysa into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #902434 in OpenERP Web: "wrong password message must remain visible"
https://bugs.launchpad.net/openerp-web/+bug/902434
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-902434-ysa/+merge/85311
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-902434-ysa/+merge/85311
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-bug-902434-ysa.
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2011-12-12 10:39:05 +0000
+++ addons/web/static/src/js/chrome.js 2011-12-12 10:43:25 +0000
@@ -513,7 +513,7 @@
openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
remember_credentials: true,
-
+
template: "Login",
identifier_prefix: 'oe-app-login-',
/**
@@ -537,7 +537,7 @@
this.selected_password = localStorage.getItem('last_password_login_success');
}
}
-
+
var qs = jQuery.deparam(jQuery.param.querystring());
if (qs.db) {
this.selected_db = qs.db;
@@ -561,7 +561,7 @@
this.rpc("/web/database/get_list", {}, function(result) {
self.set_db_list(result.db_list);
- },
+ },
function(error, event) {
if (error.data.fault_code === 'AccessDenied') {
event.preventDefault();
@@ -619,15 +619,16 @@
}
self.on_login_valid();
} else {
- self.$element.addClass("login_invalid");
+ self.$element.addClass("login_error_message");
self.on_login_invalid();
+ self.$element.find(".login_error_message").show();
}
});
},
do_ask_login: function(continuation) {
this.on_login_invalid();
this.$element
- .removeClass("login_invalid");
+ .removeClass("login_error_message");
this.on_login_valid.add({
position: "last",
unique: true,
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
