diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-13 13:13:11 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-13 13:13:11 +0200 |
| commit | 1da064a1d34b48ff23d8cdf5a1c189c8bbb4eb64 (patch) | |
| tree | d832553531790ca342cda3b03e6c44097717ff43 /addons/web/static/src/js/fields/relational_fields.js | |
| parent | 119ae9b5dcaea577bfd91b36565b764990b9de02 (diff) | |
| parent | 8ee9024a4c888647df9e18861fe5e58b68947469 (diff) | |
[MERGE] forward port branch saas-16 up to 8ee9024a4c8
Diffstat (limited to 'addons/web/static/src/js/fields/relational_fields.js')
| -rw-r--r-- | addons/web/static/src/js/fields/relational_fields.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index ed5f03b4f9b..c4422285ae7 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -423,7 +423,7 @@ var FieldMany2One = AbstractField.extend({ _updateExternalButton: function () { var has_external_button = !this.nodeOptions.no_open && !this.floating && this.isSet(); this.$external_button.toggle(has_external_button); - this.$el.toggleClass('o_with_button', has_external_button); + this.$el.toggleClass('o_with_button', has_external_button); // Should not be required anymore but kept for compatibility }, @@ -1943,7 +1943,7 @@ var FieldSelection = AbstractField.extend({ for (var i = 0 ; i < this.values.length ; i++) { this.$el.append($('<option/>', { value: JSON.stringify(this.values[i][0]), - html: this.values[i][1] + text: this.values[i][1] })); } var value = this.value; |
