diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-21 15:22:36 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-21 15:22:36 +0200 |
| commit | de987831da237ed5f9c96d50a9e51d083e072aa0 (patch) | |
| tree | ef714d2d98693eae3446620d28bb48314573018a /addons/web/static/src/xml/base.xml | |
| parent | ea2a976f31b2611b6b4ff69f4a5cdc2ffc7798fe (diff) | |
| parent | d70518d04f8f8061c8c683ea4ba8c95ae631ae45 (diff) | |
[MERGE] forward port branch 11.0 up to d70518d04f8
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 e1f955370d3..7da3f448378 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -335,12 +335,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"> @@ -861,8 +861,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"/> |