From bc8f7a44d6e2c4153dbca9c06d3e5ecfea5a9855 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 2 Jan 2018 14:21:02 +0100
Subject: [FIX] mail,web: adapt email in m2m tags b92aaf1

Adapt commit b92aaf1 for framework changes in saas-16.

That commit made Many2ManyTagsEmail widget display name_get gotten
dynamically. This allow to have 'show_email' context key working and
having the email displayed.

This commit use the new views (as of saas-16) to do the same change.

opw-801558
fixes #21812 fixes #21523
closes #21969
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d14c1f008fd..d07d3153303 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -760,7 +760,7 @@
 <t t-name="FieldMany2ManyTag">
     <t t-foreach="elements" t-as="el">
         <span t-attf-class="badge dropdown o_tag_color_#{el[colorField] || 10}" t-att-data-color="el[colorField] || 10" 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>
-- 
cgit v1.2.3


From 255e8ca3d92e3a77d7c2a145677623518bc2f978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Ku=CC=88hn?= <alex.e.kuhn@gmail.com>
Date: Fri, 5 Jan 2018 15:00:57 +0100
Subject: [FIX] web: binary field format in list view

Binary fields were simply shown simply by their textual representation in list views,
e.g. the base64 string.

There was no formatter for binary fields, therefore it has been implemented so that
it displays its estimated size.

Binary fields in list views had a download link in v10.0.
We provide this feature back by means of a widget called 'download_link'.
It is also possible to define an option to set the field name having the filename as its value.

Example:

    <tree>
        <field name="fname"/>
        <field name="datas" widget="download_link" options="{'filename': 'fname'}"/>
    </tree>

with the following record: {fname: 'document.txt', datas: 'Cg=='},
we get a file named "document.txt" by clicking on the download link.

Closes #21996
---
 addons/web/static/src/xml/base.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5df2c0ec3f7..8c69bb3439a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -924,6 +924,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"
-- 
cgit v1.2.3


From 4637bdf9bf1fa2644a048d5e586fc1b655a2940e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Mon, 8 Jan 2018 14:51:11 +0100
Subject: [FIX] web: properly format translatable string

'Edit <type>View' makes untranslatable content as it is split in 3 and the type
is not translated. e.g. 'Editer FormVoir'
---
 addons/web/static/src/xml/base.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8c69bb3439a..4d808a66f60 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -264,8 +264,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>
-- 
cgit v1.2.3