[Erp5-report] r16077 - in /erp5/trunk/products/ERP5OOo: ./ tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Sep  5 16:05:16 2007
New Revision: 16077

URL: http://svn.erp5.org?rev=16077&view=rev
Log:
format is sometimes passed as an empty string, in this case, don't proceed to conversion, but make sure headers are corrects


Modified:
    erp5/trunk/products/ERP5OOo/OOoTemplate.py
    erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py

Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=16077&r1=16076&r2=16077&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py Wed Sep  5 16:05:16 2007
@@ -483,7 +483,7 @@
       if format:
         return self._asFormat(ooo, format, request, batch_mode)
 
-    if format is None and not 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())
     else:

Modified: erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py?rev=16077&r1=16076&r2=16077&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py Wed Sep  5 16:05:16 2007
@@ -78,6 +78,16 @@
         request.RESPONSE.getHeader('content-type').split(';')[0])
     self.assertEqual('inline;filename=ERP5Site_viewNothingAsOdt',
         request.RESPONSE.getHeader('content-disposition'))
+
+  def test_01b_noExcEmptyFormatNoBatchMode(self):
+    request = self.portal.REQUEST
+    request.RESPONSE.setHeader('content-type', 'text/html')
+    ERP5Site_viewNothingAsOdt = self.getPortal().ERP5Site_viewNothingAsOdt
+    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',
+        request.RESPONSE.getHeader('content-disposition'))
     
   def test_02_noExcNoFormatBatchMode(self):
     request = self.portal.REQUEST