summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/form_widgets.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-05-13 14:08:51 +0200
committerChristophe Simonis <chs@odoo.com>2016-05-13 14:08:51 +0200
commit7f2a9e77b6dbe65e3977f8a3b15de1785bc5d7d3 (patch)
tree9a6232b1dcf1f0435b1332c126a8d9cfdc683e64 /addons/web/static/src/js/views/form_widgets.js
parent89873cbed5fb31547843a7a135145d46986431af (diff)
parentdcab356b38aad5d6c7940c0211a3a940a8be9a65 (diff)
[MERGE] forward port of branch 9.0 up to dcab356
Diffstat (limited to 'addons/web/static/src/js/views/form_widgets.js')
-rw-r--r--addons/web/static/src/js/views/form_widgets.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 1214f6e2ce3..b33177eb1d5 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -455,7 +455,13 @@ var FieldCharDomain = common.AbstractField.extend(common.ReinitializeFieldMixin,
if (this.get('value')) {
var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
- var domain = pyeval.eval('domain', this.get('value'));
+ try{
+ var domain = pyeval.eval('domain', this.get('value'));
+ }
+ catch(e){
+ this.do_warn(_t('Error: Bad domain'), _t('The domain is wrong.'));
+ return;
+ }
var ds = new data.DataSetStatic(self, model, self.build_context());
ds.call('search_count', [domain]).then(function (results) {
self.$('.o_count').text(results + _t(' selected records'));