diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-28 18:05:25 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-28 18:05:25 +0200 |
| commit | 93e6316029e237d41540bcf7ac594cc34b692d3a (patch) | |
| tree | edbb9fa9a400855d1089d8e612e98c83eb9d3904 /addons/web/static/src/xml/base.xml | |
| parent | 8eb2be4668b5677b82d581023161d31acd8abab1 (diff) | |
| parent | 71530771ea42c5bf620115e38afeaa6112f720cf (diff) | |
[MERGE] forward port of branch saas-11 up to 7153077
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 1b373d5fd50..831b4ab4932 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -748,7 +748,7 @@ </t> <t t-name="FieldMany2ManyTag"> <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="el_index" t-att-data-id="el['id']"> + <span t-attf-class="badge dropdown o_tag_color_#{el.color}" t-att-data-color="el.color" t-att-data-index="el_index" t-att-data-id="el.id"> <span class="o_badge_text" t-attf-title="#{el['display_name']}"><t t-raw="el['display_name']"/></span> <span t-if="!readonly" class="fa fa-times o_delete"/> </span> @@ -757,10 +757,10 @@ <t t-name="FieldMany2ManyTag.colorpicker"> <ul class="o_colorpicker dropdown-menu" role="menu"> <li t-foreach="10" t-as="color"> - <span t-att-data-id="tag_id" t-att-data-color="color_index + 1" t-attf-class="o_tag_color_#{color + 1}"/> + <span t-att-data-id="tag_id" t-att-data-color="color" t-attf-class="o_tag_color_#{color}"/> </li> <li> - <span 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="10" class="o_tag_color_10"/> </li> <li> Not shown in kanban |