diff options
| author | Nicolas Lempereur <nle@odoo.com> | 2015-12-15 17:41:01 +0100 |
|---|---|---|
| committer | Nicolas Lempereur <nle@odoo.com> | 2015-12-16 12:03:43 +0100 |
| commit | b9520e22e9ca2a9d95d098a31f9b8ef2ed5b03f5 (patch) | |
| tree | d7dbeeb9cf14e95ef9512c5cdc929f27ff7810f3 /addons/web/static | |
| parent | cb9d7982c1ffb346fd83cbac9a1bf9c58942c2f5 (diff) | |
[IMP] web: m2m_tags support _rec_name != 'name'
Currently, the m2m tags widget would only display the name present in
the "name" field. This prevent them from being used with custom
fields/models and other niceties.
opw-658490
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/views/form_relational_widgets.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js index 7c3048ee24b..de8112f48d1 100644 --- a/addons/web/static/src/js/views/form_relational_widgets.js +++ b/addons/web/static/src/js/views/form_relational_widgets.js @@ -1430,7 +1430,7 @@ var FieldMany2ManyTags = AbstractManyField.extend(common.CompletionFieldMixin, c get_render_data: function(ids){ var self = this; return this.mutex.exec(function(){ - var fields = self.fields.color ? ['name', 'color'] : ['name']; + var fields = self.fields.color ? ['display_name', 'name', 'color'] : ['display_name', 'name']; // TODO master: remove useless 'name' return self.dataset.read_ids(ids, fields); }); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4f9b24694a3..88b6efa6707 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -826,7 +826,7 @@ <t t-set="i" t-value="0"/> <t t-foreach="elements" t-as="el"> <span t-attf-class="badge dropdown #{'o_tag_color_' + (el['color'] || 0)}" t-att-data-color="(el['color'] || 0)" t-att-data-index="i" t-att-data-id="el['id']"> - <t t-esc="el['name']"/> + <t t-esc="el['display_name']"/> <span t-if="!readonly" class="fa fa-times o_delete"/> </span> <t t-set="i" t-value="i + 1"/> |