Bhumi Thakkar (Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-css-FF-IE-console-methods-bth into
lp:~openerp-dev/openerp-web/trunk-improve-css-FF-IE.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-css-FF-IE-console-methods-bth/+merge/126444
Hello,
Error: [Object doesn't support property or method 'warn']
Added console methods warn,info,error etc.. IN IE not supported if it is not
declared.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-css-FF-IE-console-methods-bth/+merge/126444
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-web/trunk-improve-css-FF-IE-console-methods-bth into
lp:~openerp-dev/openerp-web/trunk-improve-css-FF-IE.
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-09-25 12:01:49 +0000
+++ addons/web/static/src/js/chrome.js 2012-09-26 12:48:23 +0000
@@ -579,7 +579,7 @@
*/
do_login: function (db, login, password) {
var self = this;
- this.$el.removeClass('oe_login_invalid');
+ self.hide_error();
self.$(".oe_login_pane").fadeOut("slow");
return this.session.session_authenticate(db, login, password).pipe(function() {
if (self.has_local_storage) {
@@ -596,12 +596,19 @@
}
}
self.trigger('login_successful');
- },function () {
+ }, function () {
self.$(".oe_login_pane").fadeIn("fast", function() {
- self.$el.addClass("oe_login_invalid");
+ self.show_error("Invalid username or password");
});
});
},
+ show_error: function(message) {
+ this.$el.addClass("oe_login_invalid");
+ this.$(".oe_login_error_message").text(message);
+ },
+ hide_error: function() {
+ this.$el.removeClass('oe_login_invalid');
+ },
});
instance.web.client_actions.add("login", "instance.web.Login");
=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js 2012-09-14 16:12:46 +0000
+++ addons/web/static/src/js/coresetup.js 2012-09-26 12:48:23 +0000
@@ -3,7 +3,13 @@
*--------------------------------------------------------*/
var console;
if (!console) {
- console = {log: function () {}};
+ console = {};
+ var noop = function () {};
+ _.each('log error debug info warn assert clear dir dirxml trace group \
+ groupCollapsed groupEnd time timeEnd profile profileEnd count \
+ exception'.split(/\s+/), function (property) {
+ console[property] = noop;
+ });
}
if (!console.debug) {
console.debug = console.log;
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-09-20 08:08:15 +0000
+++ addons/web/static/src/xml/base.xml 2012-09-26 12:48:23 +0000
@@ -61,7 +61,7 @@
<t t-name="Login">
<div class="oe_login">
<div class="oe_login_bottom"> </div>
- <div class="oe_login_error_message">Invalid username or password</div>
+ <div class="oe_login_error_message"/>
<div class="oe_login_pane">
<div class="oe_login_logo"><img src='/web/static/src/img/logo2.png'/></div>
<form action="" method="post">
_______________________________________________
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
