From de3dbb971d06dd315f8897b43cfa4455f409188e Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 8 Feb 2013 12:52:38 +0100 Subject: [PATCH] [FIX] mail: add name in the dictionnary of attachments_tree and check url in js bzr revid: chm@openerp.com-20130208115238-g4ys0jrcqwamrl3p --- addons/mail/mail_message.py | 4 ++-- addons/mail/static/src/js/mail.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 16587ae24fd..77573f0d2f8 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -310,8 +310,8 @@ class mail_message(osv.Model): partner_tree = dict((partner[0], partner) for partner in partners) # 2. Attachments as SUPERUSER, because could receive msg and attachments for doc uid cannot see - attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname'], context=context) - attachments_tree = dict((attachment['id'], {'id': attachment['id'], 'filename': attachment['datas_fname']}) for attachment in attachments) + attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname', 'name'], context=context) + attachments_tree = dict((attachment['id'], {'id': attachment['id'], 'filename': attachment['datas_fname'], 'name': attachment['name']}) for attachment in attachments) # 3. Update message dictionaries for message_dict in messages: diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 0b3bddffde1..0872d049162 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -104,8 +104,8 @@ openerp.mail = function (session) { // returns the file type of a file based on its extension // As it only looks at the extension it is quite approximative. filetype: function(url){ - url = url.filename || url; - var tokens = (url+'').split('.'); + var url = url && url.filename || url; + var tokens = typeof url == 'string' ? url.split('.') : []; if(tokens.length <= 1){ return 'unknown'; }