From e901fa20e4f8b9b1577b13e8c46f3d1019271d21 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 20 Jan 2015 16:59:25 +0100 Subject: [FIX] web: don't shadow exception in do_backup --- addons/web/static/src/js/chrome.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index a9a458c8e78..0557dad2670 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -555,12 +555,9 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ self.do_notify(_t("Backed"), _t("Database backed up successfully")); }, error: function(error){ - if(error){ - self.display_error({ - title: _t("Backup Database"), - error: 'AccessDenied' - }); - } + if (error && error[1]) { + self.display_error(error[1][0]); + } }, complete: function() { self.unblockUI(); -- cgit v1.2.3 From 37e85a1e3520317e58f66daa8f58ecd833bd1208 Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Wed, 7 Jan 2015 08:40:44 +0100 Subject: [FIX] view form: Use digits to round float values on client side --- addons/web/static/src/js/view_form.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 1ea2ddb4566..0d203059fff 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2536,6 +2536,9 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({ // As in GTK client, floats default to 0 value_ = 0; } + if (this.digits !== undefined && this.digits.length === 2) { + value_ = instance.web.round_precision(value_, this.digits[1]); + } this._super.apply(this, [value_]); }, focus: function () { -- cgit v1.2.3