diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-12-21 18:24:22 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-12-21 18:24:22 +0100 |
| commit | aef8a4d61882ba728e3aae6e76b5f7dcb1f946e9 (patch) | |
| tree | e1bc9dd64acde1bf4a888f61db3e00f4510cb1f5 /addons/web/static/src | |
| parent | 9bdaf45de6f4456cfe39d0417adac052041783da (diff) | |
| parent | f9f7669e601fd9b9824d1c9c4c49cb1ff1894645 (diff) | |
[MERGE] forward port of branch 8.0 up to f9f7669
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b2b0c00d4af..80d32ee6529 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2637,6 +2637,20 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({ instance.web.form.FieldCharDomain = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, { + start: function() { + var self = this; + var tmp = this._super(); + if (this.options.model_field){ + this.field_manager.fields[this.options.model_field].on("change:value", this, function(){ + if (self.view && self.view.onchanges_mutex){ + self.view.onchanges_mutex.def.then(function(){ + self.render_value(); + }); + } + }); + } + return tmp; + }, render_value: function() { var self = this; this.$el.html(instance.web.qweb.render("FieldCharDomain", {widget: this})); @@ -2645,7 +2659,7 @@ instance.web.form.FieldCharDomain = instance.web.form.AbstractField.extend(insta var domain = instance.web.pyeval.eval('domain', this.get('value')); var ds = new instance.web.DataSetStatic(self, model, self.build_context()); ds.call('search_count', [domain, self.build_context()]).then(function (results) { - $('.oe_domain_count', self.$el).text(results + ' records selected'); + $('.oe_domain_count', self.$el).text(results + _t(' records selected')); if (self.get('effective_readonly')) { $('button span', self.$el).text(' See selection'); } |
