From 7b6cc50de71d7708881ff67620301b372c8b404d Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 24 Oct 2012 16:41:35 +0200 Subject: [PATCH] [IMP] mail: filter has attachment bzr revid: chm@openerp.com-20121024144135-frzyxty5iiksqtg4 --- addons/mail/mail_message_view.xml | 3 +++ addons/mail/static/src/js/mail.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 4677beee511..efd1c581fe5 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -63,6 +63,9 @@ + diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 35fe012e054..a44941ece0b 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -637,14 +637,14 @@ openerp.mail = function(session) { for (var l in this.attachment_ids) { var attach = this.attachment_ids[l]; attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach); - + if((attach.filename || attach.name).match(/[.](jpg|jpg|gif|png|tif|svg)$/i)) { attach.is_image = true; } if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) { attach.is_document = true; - attach.url_escape = escape(attach.url); + attach.url_escape = escape(encodeURI(attach.url)); } }