diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-08-27 11:01:30 +0530 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-08-27 17:12:56 +0200 |
| commit | d5786447567b05e85edd43dbefe8e82f22dc2129 (patch) | |
| tree | b5f5e45eb5aa58c42967f1ade50714dcb77aeb02 /addons/web/static/src/xml | |
| parent | 8ba517bfa8cce4e3f6f72ea68b24e23cdc5eb095 (diff) | |
[FIX] web, *: use correct DOM for m2m tags
* mail, calendar
- Fix traceback when clicking on a tag without color field (introduced
in recent changes)
- Properly allow to delete tags on firefox (a button obviously cannot
contain another button)
Closes https://github.com/odoo/odoo/pull/26547
Thanks to @hbh-odoo
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9b6ef0099d5..e1c74db4645 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -833,11 +833,19 @@ <t t-foreach="elements" t-as="el"> <t t-set="color" t-value="el[colorField] || 0"/> <t t-set="colornames" t-value="['No color', 'Red', 'Orange', 'Yellow', 'Light blue', 'Dark purple', 'Salmon pink', 'Medium blue', 'Dark blue', 'Fushia', 'Green', 'Purple']"/> - <div class="dropdown"> - <button t-attf-class="badge badge-pill dropdown-toggle o-no-caret o_tag_color_#{color}" data-toggle="dropdown" t-att-data-color="color" t-att-data-index="el_index" t-att-data-id="el.id" t-attf-title="Tag color: #{colornames[color]}"> + <div t-attf-class="badge badge-pill dropdown o_tag_color_#{color}" t-att-data-color="color" t-att-data-index="el_index" t-att-data-id="el.id" t-attf-title="Tag color: #{colornames[color]}"> + <t t-set="_badge_text"> <span class="o_badge_text" t-att-title="el.display_name"><span role="img" t-attf-aria-label="Tag color: #{colornames[color]}"/><t t-esc="el.display_name"/></span> - <a t-if="!readonly" class="fa fa-times o_delete" title="Delete" aria-label="Delete"/> - </button> + </t> + <t t-if="colorField"> + <a href="#" class="dropdown-toggle o-no-caret" data-toggle="dropdown"> + <t t-raw="_badge_text"/> + </a> + </t> + <t t-else=""> + <t t-raw="_badge_text"/> + </t> + <a t-if="!readonly" href="#" class="fa fa-times o_delete" title="Delete" aria-label="Delete"/> </div> </t> </t> |