From abfea0fff77466e268dfad8dd007a45c3ffbc0c0 Mon Sep 17 00:00:00 2001 From: Oleg Bulkin Date: Mon, 10 Oct 2016 15:16:50 -0700 Subject: [PATCH] web_widget_float_formula: Focused bug fix * Refactor to address bug reported in #431 in more focused fashion, rather than with broad try/catch --- .../static/src/js/web_widget_float_formula.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/web_widget_float_formula/static/src/js/web_widget_float_formula.js b/web_widget_float_formula/static/src/js/web_widget_float_formula.js index 76f5dd13..16411da7 100644 --- a/web_widget_float_formula/static/src/js/web_widget_float_formula.js +++ b/web_widget_float_formula/static/src/js/web_widget_float_formula.js @@ -15,7 +15,7 @@ odoo.define('web_widget_float_formula', function(require) { for (var f in this.fields) { if (!this.fields.hasOwnProperty(f)) { continue; } f = this.fields[f]; - if (f.hasOwnProperty('_formula_text')) { + if (f.hasOwnProperty('_formula_text') && f.$el.find('input').length > 0) { f._compute_result(); f._clean_formula_text(); } @@ -52,12 +52,7 @@ odoo.define('web_widget_float_formula', function(require) { }, _process_formula: function(formula) { - try{ - formula = formula.toString(); - } catch (ex) { - return false; - } - var clean_formula = formula.replace(/^\s+|\s+$/g, ''); + var clean_formula = formula.toString().replace(/^\s+|\s+$/g, ''); if (clean_formula[0] == '=') { clean_formula = clean_formula.substring(1); var myreg = new RegExp('[0-9]|\\s|\\.|,|\\(|\\)|\\+|\\-|\\*|\\/', 'g');