[Erp5-report] r30100 - in /erp5/trunk/products/ERP5OOo: ./ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Oct 29 11:53:58 CET 2009
Author: jerome
Date: Thu Oct 29 11:53:53 2009
New Revision: 30100
URL: http://svn.erp5.org?rev=30100&view=rev
Log:
Happens the extension in the filename in original format as well
Modified:
erp5/trunk/products/ERP5OOo/OOoTemplate.py
erp5/trunk/products/ERP5OOo/tests/testDeferredStyle.py
erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py
erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py
Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=30100&r1=30099&r2=30100&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] Thu Oct 29 11:53:53 2009
@@ -522,8 +522,11 @@
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)
- request.RESPONSE.setHeader('Content-disposition', 'inline;filename="%s"' % self.title_or_id())
+ request.RESPONSE.setHeader('Content-Type',
+ '%s; charset=utf-8' % self.content_type)
+ request.RESPONSE.setHeader('Content-disposition',
+ 'inline;filename="%s%s"' % (self.title_or_id(),
+ guess_extension(self.content_type)))
if DevelopmentMode:
# Validate XML in development mode
Modified: erp5/trunk/products/ERP5OOo/tests/testDeferredStyle.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDeferredStyle.py?rev=30100&r1=30099&r2=30100&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDeferredStyle.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDeferredStyle.py [utf8] Thu Oct 29 11:53:53 2009
@@ -42,6 +42,7 @@
"""Tests deferred styles for ERP5."""
skin = content_type = None
recipient_email_address = 'invalid at example.com'
+ attachment_file_extension = ''
username = 'bob'
password = 'bobpwd'
first_name = 'Bob'
@@ -100,10 +101,10 @@
for part in mail_message.walk():
content_type = part.get_content_type()
file_name = part.get_filename()
- # XXX the attachment name might change some day
- if file_name == 'report_view':
+ if file_name == 'report_view%s' % self.attachment_file_extension:
self.assertEquals(content_type, self.content_type)
- self.assertEquals('attachment; filename="report_view"',
+ self.assertEquals('attachment; filename="report_view%s"' %
+ self.attachment_file_extension,
part.get('Content-Disposition'))
data = part.get_payload(decode=True)
error_list = Validator().validate(data)
@@ -117,11 +118,13 @@
class TestODSDeferredStyle(TestDeferredStyle):
skin = 'ODS'
content_type = 'application/vnd.oasis.opendocument.spreadsheet'
+ attachment_file_extension = '.ods'
class TestODTDeferredStyle(TestDeferredStyle):
skin = 'ODT'
content_type = 'application/vnd.oasis.opendocument.text'
+ attachment_file_extension = '.odt'
def test_suite():
Modified: erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py?rev=30100&r1=30099&r2=30100&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py [utf8] Thu Oct 29 11:53:53 2009
@@ -77,7 +77,7 @@
ERP5Site_viewNothingAsOdt(batch_mode=0)
self.assertEqual('application/vnd.oasis.opendocument.text',
request.RESPONSE.getHeader('content-type').split(';')[0])
- self.assertEqual('inline;filename="ERP5Site_viewNothingAsOdt"',
+ self.assertEqual('inline;filename="ERP5Site_viewNothingAsOdt.odt"',
request.RESPONSE.getHeader('content-disposition'))
def test_01b_noExcEmptyFormatNoBatchMode(self):
@@ -87,7 +87,7 @@
ERP5Site_viewNothingAsOdt(format='', batch_mode=0)
self.assertEqual('application/vnd.oasis.opendocument.text',
request.RESPONSE.getHeader('content-type').split(';')[0])
- self.assertEqual('inline;filename="ERP5Site_viewNothingAsOdt"',
+ self.assertEqual('inline;filename="ERP5Site_viewNothingAsOdt.odt"',
request.RESPONSE.getHeader('content-disposition'))
def test_02_noExcNoFormatBatchMode(self):
Modified: erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py?rev=30100&r1=30099&r2=30100&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py [utf8] Thu Oct 29 11:53:53 2009
@@ -123,7 +123,7 @@
response = self.publish('/' + self.folder.Dynamic_viewAsOdt.absolute_url(1))
self.assertEqual('application/vnd.oasis.opendocument.text',
response.getHeader('content-type').split(';')[0])
- self.assertEqual('inline;filename="Dynamic_viewAsOdt"',
+ self.assertEqual('inline;filename="Dynamic_viewAsOdt.odt"',
response.getHeader('content-disposition'))
self._validate(response.getBody())
self.assertTrue(200, response.getStatus())
@@ -177,7 +177,7 @@
self.assertTrue(200, response.getStatus())
self.assertEqual('application/vnd.oasis.opendocument.text',
response.getHeader('content-type').split(';')[0])
- self.assertEqual('inline;filename="Static_viewAsOdt"',
+ self.assertEqual('inline;filename="Static_viewAsOdt.odt"',
response.getHeader('content-disposition'))
self._validate(response.getBody())
odt_zip_file = self._create_odt_zip_file(response.getBody())
More information about the Erp5-report
mailing list