From f52f8072a22df0379161c895712ad3559c549e07 Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Thu, 29 Mar 2007 22:21:32 +0000 Subject: [PATCH] User level excception must be handled through scipts or page templates, not inside classes. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13801 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5OOo/OOoTemplate.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/product/ERP5OOo/OOoTemplate.py b/product/ERP5OOo/OOoTemplate.py index 0da319e41b..241881ebcd 100644 --- a/product/ERP5OOo/OOoTemplate.py +++ b/product/ERP5OOo/OOoTemplate.py @@ -530,14 +530,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0"> REQUEST.RESPONSE.setHeader('Content-type', 'application/pdf') REQUEST.RESPONSE.setHeader('Content-disposition', 'attachment;; filename="%s.pdf"' % self.title_or_id()) return data - # now for other formats - if not tmp_ooo.isTargetFormatAllowed(format): - errstr = '%s format is not supported' % format - return tmp_ooo.returnMessage(errstr) - try: - mime, data = tmp_ooo.convert(format) - except xmlrpclib.Fault,e: - return tmp_ooo.returnMessage('Problem: %s' % str(e)) + mime, data = tmp_ooo.convert(format) if REQUEST is not None: REQUEST.RESPONSE.setHeader('Content-type', mime) REQUEST.RESPONSE.setHeader('Content-disposition', 'attachment;; filename="%s.%s"' % (self.title_or_id(),format)) -- 2.30.9