[IMP] report_fillpdf, report_xlsx, report_xml: Use content_disposition helper

naglis · naglis · commit aa2ea62b23a0 · 2018-03-11T15:59:07.000+02:00
diff --git a/report_fillpdf/__manifest__.py b/report_fillpdf/__manifest__.py
@@ -9,7 +9,7 @@
               'Odoo Community Association (OCA)',
     'website': "http://github.com/oca/reporting-engine",
     'category': 'Reporting',
-    'version': '11.0.1.0.0',
+    'version': '11.0.1.0.1',
     'license': 'AGPL-3',
     'external_dependencies': {
         'python': [
diff --git a/report_fillpdf/controllers/main.py b/report_fillpdf/controllers/main.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html).
 
 from odoo.addons.web.controllers import main as report
-from odoo.http import route, request
+from odoo.http import content_disposition, route, request
 
 import json
 
@@ -34,7 +34,7 @@ def report_routes(self, reportname, docids=None, converter=None, **data):
                 ('Content-Length', len(pdf)),
                 (
                     'Content-Disposition',
-                    'attachment; filename=' + report.report_file + '.pdf'
+                    content_disposition(report.report_file + '.pdf')
                 )
             ]
             return request.make_response(pdf, headers=pdfhttpheaders)
diff --git a/report_xlsx/__manifest__.py b/report_xlsx/__manifest__.py
@@ -10,7 +10,7 @@
               'Odoo Community Association (OCA)',
     'website': "http://github.com/oca/reporting-engine",
     'category': 'Reporting',
-    'version': '11.0.1.0.0',
+    'version': '11.0.1.0.1',
     'license': 'AGPL-3',
     'external_dependencies': {
         'python': [
diff --git a/report_xlsx/controllers/main.py b/report_xlsx/controllers/main.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html).
 
 from odoo.addons.web.controllers import main as report
-from odoo.http import route, request
+from odoo.http import content_disposition, route, request
 
 import json
 
@@ -35,7 +35,7 @@ def report_routes(self, reportname, docids=None, converter=None, **data):
                 ('Content-Length', len(xlsx)),
                 (
                     'Content-Disposition',
-                    'attachment; filename=' + report.report_file + '.xlsx'
+                    content_disposition(report.report_file + '.xlsx')
                 )
             ]
             return request.make_response(xlsx, headers=xlsxhttpheaders)
diff --git a/report_xml/__manifest__.py b/report_xml/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "XML Reports",
-    "version": "11.0.1.0.0",
+    "version": "11.0.1.0.1",
     "category": "Reporting",
     "website": "https://github.com/OCA/reporting-engine",
     "author": "Grupo ESOC Ingeniería de Servicios, "
diff --git a/report_xml/controllers/main.py b/report_xml/controllers/main.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html).
 
 from odoo.addons.web.controllers import main as report
-from odoo.http import route
+from odoo.http import content_disposition, route
 
 
 class ReportController(report.ReportController):
@@ -23,5 +23,5 @@ def report_routes(self, reportname, docids=None, converter=None, **data):
             response.headers.set('Content-length', len(response.data))
             response.headers.set(
                 'Content-Disposition',
-                'attachment; filename="'+reportname+".xml")
+                content_disposition(reportname + ".xml"))
         return response

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html).`
`3`	`3`
`4`	`4`	`from odoo.addons.web.controllers import main as report`
`5`		`-from odoo.http import route, request`
	`5`	`+from odoo.http import content_disposition, route, request`
`6`	`6`
`7`	`7`	`import json`
`8`	`8`
`@@ -34,7 +34,7 @@ def report_routes(self, reportname, docids=None, converter=None, **data):`
`34`	`34`	`('Content-Length', len(pdf)),`
`35`	`35`	`(`
`36`	`36`	`'Content-Disposition',`
`37`		`- 'attachment; filename=' + report.report_file + '.pdf'`
	`37`	`+ content_disposition(report.report_file + '.pdf')`
`38`	`38`	`)`
`39`	`39`	`]`
`40`	`40`	`return request.make_response(pdf, headers=pdfhttpheaders)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`{`
`6`	`6`	`"name": "XML Reports",`
`7`		`- "version": "11.0.1.0.0",`
	`7`	`+ "version": "11.0.1.0.1",`
`8`	`8`	`"category": "Reporting",`
`9`	`9`	`"website": "https://github.com/OCA/reporting-engine",`
`10`	`10`	`"author": "Grupo ESOC Ingeniería de Servicios, "`