[IMP] web: better content-type for attachments

Add the corresponding content type document instead the default content type.
This allows browser to detect the type of file being downloaded.
Fixes #1225
This commit is contained in:
EL HADJI DEM 2014-07-16 17:14:12 -04:00 committed by Your Name
parent 11cd22711c
commit 7b0d707417
1 changed files with 10 additions and 2 deletions

View File

@ -1086,10 +1086,14 @@ class Binary(http.Controller):
Model = request.registry[model]
cr, uid, context = request.cr, request.uid, request.context
fields = [field]
content_type = 'application/octet-stream'
if filename_field:
fields.append(filename_field)
if id:
fields.append('file_type')
res = Model.read(cr, uid, [int(id)], fields, context)[0]
if res.get('file_type'):
content_type = res['file_type']
else:
res = Model.default_get(cr, uid, fields, context)
filecontent = base64.b64decode(res.get(field) or '')
@ -1100,7 +1104,7 @@ class Binary(http.Controller):
if filename_field:
filename = res.get(filename_field, '') or filename
return request.make_response(filecontent,
[('Content-Type', 'application/octet-stream'),
[('Content-Type', content_type),
('Content-Disposition', content_disposition(filename))])
@http.route('/web/binary/saveas_ajax', type='http', auth="public")
@ -1113,6 +1117,7 @@ class Binary(http.Controller):
id = jdata.get('id', None)
filename_field = jdata.get('filename_field', None)
context = jdata.get('context', {})
content_type = 'application/octet-stream'
Model = request.session.model(model)
fields = [field]
@ -1121,7 +1126,10 @@ class Binary(http.Controller):
if data:
res = {field: data, filename_field: jdata.get('filename', None)}
elif id:
fields.append('file_type')
res = Model.read([int(id)], fields, context)[0]
if res.get('file_type'):
content_type = res['file_type']
else:
res = Model.default_get(fields, context)
filecontent = base64.b64decode(res.get(field) or '')
@ -1133,7 +1141,7 @@ class Binary(http.Controller):
if filename_field:
filename = res.get(filename_field, '') or filename
return request.make_response(filecontent,
headers=[('Content-Type', 'application/octet-stream'),
headers=[('Content-Type', content_type),
('Content-Disposition', content_disposition(filename))],
cookies={'fileToken': token})