diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-10 11:41:35 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-10 11:41:35 +0100 |
| commit | 228ecdbe28246b0031a9cf7e63b90f4ae11131df (patch) | |
| tree | 33a3c3807c98ee79352abce486decd365e33b1b9 /addons/web/static/src/xml | |
| parent | 8270b212909de5cb26e958c023a4f0a27947eeef (diff) | |
| parent | ff0abd214c89dce19984ed0f3c72ea556e23da01 (diff) | |
[MERGE] forward port branch 11.0 up to ff0abd214c8
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6ecc29652a7..8ee6f643c51 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -265,8 +265,19 @@ </t> <li><a href="#" data-action="fvg">Fields View Get</a></li> <t t-if="can_edit"> - <li><a href="#" data-action="edit" data-model="ir.ui.view" t-att-data-id="view.fields_view.view_id">Edit <t t-esc="_.str.capitalize(view.type)"/>View</a></li> - <li t-if="searchview and searchview.$el.is(':visible')"><a href="#" data-action="edit" data-model="ir.ui.view" t-att-data-id="searchview.fields_view.view_id">Edit SearchView</a></li> + <li> + <a href="#" data-action="edit" data-model="ir.ui.view" t-att-data-id="view.fields_view.view_id"> + <t t-if="view.type == 'form'">Edit Form view</t> + <t t-elif="view.type == 'list'">Edit List view</t> + <t t-elif="view.type == 'kanban'">Edit Kanban view</t> + <t t-elif="view.type == 'graph'">Edit Graph view</t> + <t t-elif="view.type == 'gantt'">Edit Gantt view</t> + <t t-elif="view.type == 'pivot'">Edit Pivot view</t> + <t t-elif="view.type == 'calendar'">Edit Calendar view</t> + <t t-else="1">Edit view, type: <t t-esc="_.str.capitalize(view.type)"/></t> + </a> + </li> + <li t-if="searchview and searchview.$el.is(':visible')"><a href="#" data-action="edit" data-model="ir.ui.view" t-att-data-id="searchview.fields_view.view_id">Edit Search view</a></li> </t> </t> </t> @@ -786,7 +797,7 @@ <t t-foreach="elements" t-as="el"> <t t-set="color" t-value="el[colorField] || 0"/> <span t-attf-class="badge dropdown o_tag_color_#{color}" t-att-data-color="color" t-att-data-index="el_index" t-att-data-id="el.id"> - <span class="o_badge_text"><t t-raw="el.display_name"/></span> + <span class="o_badge_text"><t t-esc="el.display_name"/></span> <span t-if="!readonly" class="fa fa-times o_delete"/> </span> </t> @@ -895,6 +906,9 @@ </t> </div> </t> +<t t-name="FieldBinaryDownloadLink"> + <a t-att-download="widget.filename" t-att-href="widget.url"><t t-esc="widget.text"/></a> +</t> <t t-name="HiddenInputFile"> <div t-attf-class="o_hidden_input_file #{fileupload_class or ''}" t-att-style="fileupload_style"> <form class="o_form_binary_form" t-att-target="fileupload_id" |