Commit a9675974 authored by Jérome Perrin's avatar Jérome Perrin

content disposition needs "" arround filename to support spaces in the filename


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24942 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fec4f962
...@@ -522,7 +522,7 @@ class OOoTemplate(ZopePageTemplate): ...@@ -522,7 +522,7 @@ class OOoTemplate(ZopePageTemplate):
if not format and not batch_mode: if not format and not batch_mode:
request.RESPONSE.setHeader('Content-Type','%s; charset=utf-8' % self.content_type) request.RESPONSE.setHeader('Content-Type','%s; charset=utf-8' % self.content_type)
request.RESPONSE.setHeader('Content-disposition', 'inline;filename=%s' % self.title_or_id()) request.RESPONSE.setHeader('Content-disposition', 'inline;filename="%s"' % self.title_or_id())
if DevelopmentMode: if DevelopmentMode:
# Validate XML in development mode # Validate XML in development mode
...@@ -568,22 +568,26 @@ class OOoTemplate(ZopePageTemplate): ...@@ -568,22 +568,26 @@ class OOoTemplate(ZopePageTemplate):
if x[1].endswith('pdf')] if x[1].endswith('pdf')]
if len(tgts) > 1: if len(tgts) > 1:
REQUEST.RESPONSE.setHeader('Content-type', 'text/html') REQUEST.RESPONSE.setHeader('Content-type', 'text/html')
REQUEST.RESPONSE.setHeader('Content-disposition', 'inline;filename=%s.pdf' % self.title_or_id()) REQUEST.RESPONSE.setHeader('Content-disposition',
'inline;filename="%s.pdf"' % self.title_or_id())
raise ValueError, 'multiple pdf formats found - this shouldnt happen' raise ValueError, 'multiple pdf formats found - this shouldnt happen'
if len(tgts) == 0: if len(tgts) == 0:
REQUEST.RESPONSE.setHeader('Content-type', 'text/html') REQUEST.RESPONSE.setHeader('Content-type', 'text/html')
REQUEST.RESPONSE.setHeader('Content-disposition', 'inline;filename=%s.pdf' % self.title_or_id()) REQUEST.RESPONSE.setHeader('Content-disposition',
'inline;filename="%s.pdf"' % self.title_or_id())
raise ValueError, 'no pdf format found' raise ValueError, 'no pdf format found'
fmt = tgts[0] fmt = tgts[0]
mime, data = tmp_ooo.convert(fmt) mime, data = tmp_ooo.convert(fmt)
if REQUEST is not None: if REQUEST is not None:
REQUEST.RESPONSE.setHeader('Content-type', 'application/pdf') REQUEST.RESPONSE.setHeader('Content-type', 'application/pdf')
REQUEST.RESPONSE.setHeader('Content-disposition', 'attachment;filename=%s.pdf' % self.title_or_id()) REQUEST.RESPONSE.setHeader('Content-disposition',
'attachment;filename="%s.pdf"' % self.title_or_id())
return data return data
mime, data = tmp_ooo.convert(format) mime, data = tmp_ooo.convert(format)
if REQUEST is not None and not batch_mode: if REQUEST is not None and not batch_mode:
REQUEST.RESPONSE.setHeader('Content-type', mime) REQUEST.RESPONSE.setHeader('Content-type', mime)
REQUEST.RESPONSE.setHeader('Content-disposition', 'attachment;filename=%s.%s' % (self.title_or_id(),format)) REQUEST.RESPONSE.setHeader('Content-disposition',
'attachment;filename="%s.%s"' % (self.title_or_id(),format))
# FIXME the above lines should return zip format when html was requested # FIXME the above lines should return zip format when html was requested
return data return data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment