pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] ir_attachment: avoid crashing when giving void

Browse Source 
files or URLs, guess_type does not accept False / void values.
This commit is contained in:
Thibault Delavallée
2015-02-03 15:43:09 +01:00
parent 744ae9b86f
commit c6525a130c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_attachment.py
+4 -4
View File
@@ -264,10 +264,10 @@ class ir_attachment(osv.osv):
:return mime : string indicating the mimetype, or application/octet-stream by default
"""
mimetype = 'application/octet-stream'
if 'datas_fname' in values:
mimetype = mimetypes.guess_type(values.get('datas_fname'))[0]
if 'datas' in values:
mimetype = guess_mimetype(values.get('datas').decode('base64'))
if values.get('datas_fname'):
mimetype = mimetypes.guess_type(values['datas_fname'])[0]
if values.get('datas'):
mimetype = guess_mimetype(values['datas'].decode('base64'))
return mimetype
def _index(self, cr, uid, bin_data, datas_fname, file_type):