diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-08 19:00:04 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-08 19:00:04 +0100 |
| commit | a0aa939d9b8440ae1223e103d70ae84455a1f9bc (patch) | |
| tree | 129d0dd58abc42457ee4cbd8072d4059e2f24a2a /addons/web/static/src | |
| parent | 8f118ad5338878f399b02edba2440442e14cc1ab (diff) | |
| parent | fcb48b724152db876f6752560cce5a5d875e8f46 (diff) | |
[MERGE] forward port branch 11.0 up to fcb48b72415
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/core/utils.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_renderer.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/core/utils.js b/addons/web/static/src/js/core/utils.js index 251cd2b508c..ffeb4a1de87 100644 --- a/addons/web/static/src/js/core/utils.js +++ b/addons/web/static/src/js/core/utils.js @@ -228,7 +228,7 @@ var utils = { * @returns {boolean} */ is_bin_size: function (v) { - return (/^\d+(\.\d*)? \w+$/).test(v); + return (/^\d+(\.\d*)? [^0-9]+$/).test(v); }, /** * @param {any} node diff --git a/addons/web/static/src/js/views/basic/basic_renderer.js b/addons/web/static/src/js/views/basic/basic_renderer.js index 27cdf23b18b..977674c022a 100644 --- a/addons/web/static/src/js/views/basic/basic_renderer.js +++ b/addons/web/static/src/js/views/basic/basic_renderer.js @@ -617,7 +617,7 @@ var BasicRenderer = AbstractRenderer.extend({ */ _renderWidget: function (record, node) { var Widget = widgetRegistry.get(node.attrs.name); - var widget = new Widget(this, record); + var widget = new Widget(this, record, node); this.widgets.push(widget); |