[Erp5-report] r13801 - /erp5/trunk/products/ERP5OOo/OOoTemplate.py

[nobody at svn.erp5.org]

Author: jp
Date: Fri Mar 30 00:21:32 2007
New Revision: 13801

URL: http://svn.erp5.org?rev=13801&view=rev
Log:
User level excception must be handled through scipts or page templates, not inside classes.

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=13801&r1=13800&r2=13801&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py Fri Mar 30 00:21:32 2007
@@ -530,14 +530,7 @@
           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))