[Erp5-report] r17337 - /erp5/trunk/products/ERP5OOo/OOoTemplate.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Nov 1 10:23:35 CET 2007
Author: jerome
Date: Thu Nov 1 10:23:35 2007
New Revision: 17337
URL: http://svn.erp5.org?rev=17337&view=rev
Log:
Don't assume that extra_context will contain an "options" dictionnary
Modified:
erp5/trunk/products/ERP5OOo/OOoTemplate.py
Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=17337&r1=17336&r2=17337&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py Thu Nov 1 10:23:35 2007
@@ -461,9 +461,9 @@
self.OLE_documents_zipstring = None
# Convert if necessary
- opts = extra_context.get("options", None)
-
- # Get request and batch_mode
+ opts = extra_context.get("options", dict())
+
+ # Get batch_mode
batch_mode = opts.get('batch_mode', None)
# If the file has embedded OLE documents, restore it
@@ -478,10 +478,9 @@
# Produce final result
ooo = ooo_builder.render(name=self.title or self.id)
- if opts is not None:
- format = opts.get('format', request.get('format', None))
- if format:
- return self._asFormat(ooo, format, request, batch_mode)
+ format = opts.get('format', request.get('format', None))
+ if format:
+ return self._asFormat(ooo, format, request, batch_mode)
if not format and not batch_mode:
request.RESPONSE.setHeader('Content-Type','%s; charset=utf-8' % self.content_type)
More information about the Erp5-report
mailing list