diff options
| author | Martin Geubelle <mge@odoo.com> | 2015-09-08 13:18:36 +0200 |
|---|---|---|
| committer | Martin Geubelle <mge@odoo.com> | 2015-09-08 16:24:32 +0200 |
| commit | 247e5865424cdd7581308dfa3e0ea7ea98fd8db7 (patch) | |
| tree | b07255b3bbb8dbe17769e736cf0cbeaa859e08b4 /addons/web/static/src/xml/base.xml | |
| parent | 7d77678f2fd37ba6ed92c6c019d8ece7e62469a4 (diff) | |
[FIX] web: many2many2tags if no color field
If there is no field 'color' on tag model, the colorpicker should not be displayed.
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4d95b0e81a0..131e42c4042 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -840,7 +840,7 @@ <t t-name="FieldMany2ManyTag"> <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']}" t-att-data-index="i" t-att-data-id="el['id']"> + <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']"/> <span t-if="!readonly" class="fa fa-times o_delete"/> </span> @@ -850,12 +850,12 @@ <t t-name="FieldMany2ManyTag.colorpicker"> <ul class="o_colorpicker dropdown-menu" role="menu"> <li t-foreach="10" t-as="color"> - <a href="#" t-att-data-id="tag_id" t-att-data-color="color_index + 1" t-attf-class="o_tag_color_#{color + 1}"/> + <span href="#" t-att-data-id="tag_id" t-att-data-color="color_index + 1" t-attf-class="o_tag_color_#{color + 1}"/> </li> <li> - <a href="#" t-att-data-id="tag_id" t-att-data-color="0" class="o_tag_color_0"/> + <span t-att-data-id="tag_id" t-att-data-color="0" class="o_tag_color_0"/> </li> - <li style="margin-top: 7px"> + <li> No color (hidden in kanban) </li> </ul> |