diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-01-06 14:57:27 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-01-06 14:57:27 +0100 |
| commit | 0b2d085c1b24f68b1f5d8ce25f2671019560f18c (patch) | |
| tree | 3ce427721618d8a68f50dcc4bf1997173e67474d /addons/mail/static/src/xml/mail.xml | |
| parent | 49c0b7a82003a889edc19cb189d0d6d0ebda2c5f (diff) | |
[IMP] shop: added openchatter on product shop
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template
bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 31539e24ab3..3a7a5469ee1 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -88,10 +88,10 @@ --> <t t-name="mail.thread.message.attachments"> <t t-foreach='widget.attachment_ids' t-as='attachment'> - <t t-if="attachment.filetype !== 'webimage'"> + <t t-if="attachment.file_type !== 'webimage'"> <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}"> <a t-att-href='attachment.url' target="_blank"> - <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img> + <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.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> @@ -100,7 +100,7 @@ </div> </div> </t> - <t t-if="attachment.filetype === 'webimage'"> + <t t-if="attachment.file_type === 'webimage'"> <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}"> <a t-att-href='attachment.url' target="_blank"> <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img> |