From 6c9e45576e8de511fb5da8b2118dd844b38c4782 Mon Sep 17 00:00:00 2001
From: Lucas Perais <lcsperais@gmail.com>
Date: Wed, 18 Oct 2017 14:25:22 +0200
Subject: [FIX] document: display create_date of attachment timezone aware
 (#20242)

Before this commit, when putting the mouse over an attachment in the attachment drop menu list, the date time displayed was UTC only.
After this commit, we convert that value to the correct timezone datetime.

OPW 776704
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 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 a4773488d30..b51aba21278 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -334,12 +334,12 @@
                         <t t-if="item.create_uid and item.create_uid[0]" t-set="item.title">
                             <t t-raw="item.title"/><br/>
                             <b>Created by : </b><br/>
-                            <t t-raw="item.create_uid[1] + ' ' + item.create_date"/>
+                            <t t-raw="item.create_uid[1]"/>  <t t-esc="item.create_date_string" />
                         </t>
                         <t t-if="item.create_uid and item.write_uid and item.create_uid[0] != item.write_uid[0]" t-set="item.title">
                             <t t-raw="item.title"/><br/>
                             <b>Modified by : </b><br/>
-                            <t t-raw="item.write_uid[1] + ' ' + item.write_date"/>
+                            <t t-raw="item.write_uid[1]"/>  <t t-esc="item.write_date_string"/>
                         </t>
                     </t>
                     <a t-att-title="item.title or None" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url">
-- 
cgit v1.2.3


From 1312ee72cf35e3887721ac56472f1188f636ec61 Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Thu, 19 Oct 2017 12:00:50 +0200
Subject: [FIX] web: correctly render the field image

Before this commit, the image was directly built without using the corresponding
template, which set some properties on the image (class, width, etc.).
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 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 a397e8c148d..d14c1f008fd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -836,8 +836,8 @@
         t-att-src='url'
         t-att-border="widget.readonly ? 0 : 1"
         t-att-name="widget.name"
-        t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
-        t-att-height="widget.node.attrs.img_height || widget.node.attrs.height"/>
+        t-att-width="widget.nodeOptions.size ? widget.nodeOptions.size[0] : widget.attrs.img_width || widget.attrs.width"
+        t-att-height="widget.nodeOptions.size ? widget.nodeOptions.size[1] : widget.attrs.img_height || widget.attrs.height"/>
 </t>
 <t t-name="FieldBinaryFile">
     <a t-if="widget.mode === 'readonly'" href="javascript:void(0)" class="o_form_uri"/>
-- 
cgit v1.2.3