odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] correctly handle filenames in list view binaries 

bzr revid: xmo@openerp.com-20120110155020-ab02qb0ktlfxnwvb
This commit is contained in:
Xavier Morel 2012-01-10 16:50:20 +01:00
parent d98b8b8be0
commit d54a196811
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/controllers/main.py
View File

@ -1217,7 +1217,7 @@ class Binary(openerpweb.Controller):
filename = res.get(filename_field, '') or filename
return req.make_response(filecontent,
[('Content-Type', 'application/octet-stream'),
('Content-Disposition', 'attachment; filename=' + filename)])
('Content-Disposition', 'attachment; filename="%s"' % filename)])
@openerpweb.httprequest
def upload(self, req, callback, ufile):

15
addons/web/static/src/js/formats.js
View File

@ -289,11 +289,18 @@ openerp.web.format_cell = function (row_data, column, options) {
return _.str.sprintf('<input type="checkbox" %s disabled="disabled"/>',
row_data[column.id].value ? 'checked="checked"' : '');
case "binary":
var text = _t("Download"),
download_url = _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d', openerp.connection.session_id, options.model, column.id, options.id);
if (column.filename) {
download_url += '&filename_field=' + column.filename;
if (row_data[column.filename]) {
text = _.str.sprintf(_t("Download \"%s\""), openerp.web.format_value(
row_data[column.filename].value, {type: 'char'}));
}
}
return _.str.sprintf('<a href="%(href)s">%(text)s</a> (%(size)s)', {
text: _t("Download"),
href: _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d',
openerp.connection.session_id, options.model,
column.id, options.id),
text: text,
href: download_url,
size: row_data[column.id].value
});
}