[12.0][FIX] excel_import_export, fix wrong file name on report_action
When mark to convert xlsx to csv, csv file name is not usedpull/2505/head
parent
7d8558c3a8
commit
c119f35f3d
|
@ -29,22 +29,23 @@ class ReportController(report.ReportController):
|
|||
if data['context'].get('lang'):
|
||||
del data['context']['lang']
|
||||
context.update(data['context'])
|
||||
excel = report.with_context(context).render_excel(
|
||||
excel, report_name = report.with_context(context).render_excel(
|
||||
docids, data=data
|
||||
)[0]
|
||||
)
|
||||
excel = base64.decodestring(excel)
|
||||
report_name = report.report_file
|
||||
if report.print_report_name and not len(docids) > 1:
|
||||
obj = request.env[report.model].browse(docids[0])
|
||||
file_ext = report_name.split('.')[-1:].pop()
|
||||
report_name = safe_eval(report.print_report_name,
|
||||
{'object': obj, 'time': time})
|
||||
report_name = '%s.%s' % (report_name, file_ext)
|
||||
excelhttpheaders = [
|
||||
('Content-Type', 'application/vnd.openxmlformats-'
|
||||
'officedocument.spreadsheetml.sheet'),
|
||||
('Content-Length', len(excel)),
|
||||
(
|
||||
'Content-Disposition',
|
||||
content_disposition(report_name + '.xlsx')
|
||||
content_disposition(report_name)
|
||||
)
|
||||
]
|
||||
return request.make_response(excel, headers=excelhttpheaders)
|
||||
|
|
Loading…
Reference in New Issue