[MERGE] trunk-report-name-tpa (pick a better file name when saving a report)

bzr revid: rco@openerp.com-20120509150110-6gx73y1vbjksm64h
2012-05-09 17:01:10 +02:00
parent 8a4959cd29 f4848e106e
commit 73e7da8dce
1 changed files with 7 additions and 1 deletions
@@ -1818,9 +1818,15 @@ class Reports(View):
            report = zlib.decompress(report)
        report_mimetype = self.TYPES_MAPPING.get(
            report_struct['format'], 'octet-stream')
+        if 'name' not in action:
+            reports = req.session.model('ir.actions.report.xml')
+            res_id = reports.search([('report_name', '=',action['report_name']),],
+                                    0, False, False, context)
+            action['name'] = reports.read(res_id, ['name'], context)[0]['name']
+
        return req.make_response(report,
             headers=[
-                 ('Content-Disposition', 'attachment; filename="%s.%s"' % (action['report_name'], report_struct['format'])),
+                 ('Content-Disposition', 'attachment; filename="%s.%s"' % (action['name'], report_struct['format'])),
                 ('Content-Type', report_mimetype),
                 ('Content-Length', len(report))],
             cookies={'fileToken': int(token)})