From 7aeeb5a3083f66c2e2a316b0f63e3d855f7cfdc4 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 22 Sep 2009 15:15:23 +0000
Subject: [PATCH] display converted result in the browser if requested format
is standard image format.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29137 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5OOo/Document/OOoDocument.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/product/ERP5OOo/Document/OOoDocument.py b/product/ERP5OOo/Document/OOoDocument.py
index d90426fd36..33b0c70a94 100644
--- a/product/ERP5OOo/Document/OOoDocument.py
+++ b/product/ERP5OOo/Document/OOoDocument.py
@@ -198,12 +198,16 @@ class OOoDocument(PermanentURLMixIn, File, ConversionCacheMixin):
converted_filename = '%s.%s'%(filename.split('.')[0], format)
if not mime:
mime = getToolByName(self, 'mimetypes_registry').lookupExtension('name.%s' % format)
- RESPONSE.setHeader('Content-Length', len(result))
- RESPONSE.setHeader('Content-Type', mime)
- RESPONSE.setHeader('Accept-Ranges', 'bytes')
- RESPONSE.setHeader('Content-Disposition',
- 'attachment; filename="%s"' % converted_filename)
- return result
+ if format in STANDARD_IMAGE_FORMAT_LIST:
+ RESPONSE.setHeader('Content-Type', mime)
+ return result.index_html(REQUEST, RESPONSE)
+ else:
+ RESPONSE.setHeader('Content-Length', len(result))
+ RESPONSE.setHeader('Content-Type', mime)
+ RESPONSE.setHeader('Accept-Ranges', 'bytes')
+ RESPONSE.setHeader('Content-Disposition',
+ 'attachment; filename="%s"' % converted_filename)
+ return result
# Format conversion implementation
def _getServerCoordinate(self):
--
2.30.9