[Erp5-report] r39404 seb - in /erp5/trunk/products/ERP5OOo: OOoTemplate.py OOoUtils.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Oct 20 18:55:09 CEST 2010
Author: seb
Date: Wed Oct 20 18:55:09 2010
New Revision: 39404
URL: http://svn.erp5.org?rev=39404&view=rev
Log:
do not set headers while requesting the source
Modified:
erp5/trunk/products/ERP5OOo/OOoTemplate.py
erp5/trunk/products/ERP5OOo/OOoUtils.py
Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=39404&r1=39403&r2=39404&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] Wed Oct 20 18:55:09 2010
@@ -557,7 +557,7 @@ class OOoTemplate(ZopePageTemplate):
if batch_mode:
ooo = ooo_builder.render()
else:
- ooo = ooo_builder.render(name=self.title or self.id)
+ ooo = ooo_builder.render(name=self.title or self.id, source=source)
if DevelopmentMode:
# Validate XML in development mode
Modified: erp5/trunk/products/ERP5OOo/OOoUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoUtils.py?rev=39404&r1=39403&r2=39404&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoUtils.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/OOoUtils.py [utf8] Wed Oct 20 18:55:09 2010
@@ -199,12 +199,12 @@ class OOoBuilder(Implicit):
is_legacy = ('oasis.opendocument' not in self.getMimeType())
return "%s%s" % (is_legacy and '#' or '', name,)
- def render(self, name='', extension='sxw'):
+ def render(self, name='', extension='sxw', source=False):
"""
returns the OOo document
"""
request = get_request()
- if name:
+ if name and not(source):
request.response.setHeader('Content-Disposition',
'attachment; filename=%s.%s' % (name, extension))
More information about the Erp5-report
mailing list