Kunal Chavda (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-change_password_dialogbox-kch into
lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-change_password_dialogbox-kch/+merge/118499
I have fix minor problem of showing text on change_password dialog box's button.
Thanks,
Kunal Chavda(KCH)
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-change_password_dialogbox-kch/+merge/118499
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-change_password_dialogbox-kch.
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-08-06 15:02:48 +0000
+++ addons/web/static/src/js/chrome.js 2012-08-07 07:38:20 +0000
@@ -109,7 +109,7 @@
} 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 @@
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 @@
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 @@
modal: true,
title: error.title,
buttons: [
- {text: _("Ok"), click: function() { $(this).dialog("close"); }}
+ {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
]
}).html(error.error);
},
_______________________________________________
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