From b1b78021b218700b84d4297bb2525e4ce1e86ccc Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Tue, 7 Aug 2012 13:03:39 +0530 Subject: [PATCH 1/2] [FIX]Minor problem of showing change password dialog box's button text. bzr revid: kch@tinyerp.com-20120807073339-1w585w2pyggd9wzn --- addons/web/static/src/js/chrome.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 45cbaf46bfb..9af03cd8eb2 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -109,7 +109,7 @@ instance.web.Dialog = instance.web.Widget.extend({ } else if (val.slice(-1) == "%") { return Math.round(available_size / 100 * parseInt(val.slice(0, -1), 10)); } else { - return parseInt(val, 10); + return parseInt(val, 10); } }, renderElement: function() { @@ -123,7 +123,7 @@ instance.web.Dialog = instance.web.Widget.extend({ if (! this.dialog_inited) this.init_dialog(); var o = this.get_options(options); - instance.web.dialog(this.$element, o).dialog('open'); + instance.web.dialog(this.$element, o).dialog('open'); if (o.height === 'auto' && o.max_height) { this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' }); } @@ -627,7 +627,7 @@ instance.web.Reload = instance.web.Widget.extend({ var search = "?ts=" + timestamp; if (l.search) { search = l.search + "&ts=" + timestamp; - } + } var hash = l.hash; if (this.menu_id) { hash = "#menu_id=" + this.menu_id; @@ -855,7 +855,7 @@ instance.web.UserMenu = instance.web.Widget.extend({ modal: true, title: error.title, buttons: [ - {text: _("Ok"), click: function() { $(this).dialog("close"); }} + {text: _t("Ok"), click: function() { $(this).dialog("close"); }} ] }).html(error.error); }, From f69aae2d0136389f485989931905ce76059ba395 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Thu, 9 Aug 2012 11:59:09 +0530 Subject: [PATCH 2/2] [FIX]self.element itself gives form element so no need to find in it. bzr revid: kch@tinyerp.com-20120809062909-fdsqvowhnz1nwgcl --- addons/web/static/src/js/chrome.js | 2 +- addons/web/static/src/xml/base.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index c88c0ec2ef8..36f9c74be8b 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -665,7 +665,7 @@ instance.web.ChangePassword = instance.web.Widget.extend({ template: "ChangePassword", start: function() { var self = this; - self.$element.find("form[name=change_password_form]").validate({ + self.$element.validate({ submitHandler: function (form) { self.rpc("/web/session/change_password",{ 'fields': $(form).serializeArray() diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5c7cfec800f..ef6a0b7f01f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -282,7 +282,7 @@ + minlength="1"/> @@ -1049,7 +1049,7 @@ - +