diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-02-20 16:43:15 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-02-20 16:43:15 +0100 |
| commit | b0be8dfdfd78c7953c1f60bf86b862bc46abd65c (patch) | |
| tree | 809f773fb0e15134bbf7aa491de566f1136e6ee2 /addons/mail/static | |
| parent | a9ba27b79f563088f84667d5d1b405e5e87a369b (diff) | |
| parent | aae75f1e297cb6b370bac7341f54f310923fe5dc (diff) | |
[MERGE] forward port of branch saas-3 up to aae75f1
Diffstat (limited to 'addons/mail/static')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index bf5430c52de..0eb7fcff550 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -95,7 +95,7 @@ <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type_icon + '.png'"></img> <div class='oe_name'><t t-raw='attachment.name' /></div> </a> - <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div> + <div t-if="!attachment.upload" class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div> <div class='oe_progress_bar'> uploading </div> @@ -107,7 +107,7 @@ <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img> <div class='oe_name'><t t-raw='attachment.name' /></div> </a> - <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div> + <div t-if="!attachment.upload" class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div> <div class='oe_progress_bar'> uploading </div> |