[Erp5-report] r40263 kazuhiko - /erp5/trunk/products/ERP5/mixin/downloadable.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Nov 15 11:16:00 2010
New Revision: 40263

URL: http://svn.erp5.org?rev=40263&view=rev
Log:
getStandardFileName() should be called with the passed format argument, not with the guessed format value.

Modified:
    erp5/trunk/products/ERP5/mixin/downloadable.py

Modified: erp5/trunk/products/ERP5/mixin/downloadable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/downloadable.py?rev=40263&r1=40262&r2=40263&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/downloadable.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/downloadable.py [utf8] Mon Nov 15 11:16:00 2010
@@ -86,18 +86,20 @@ class DownloadableMixin:
       mimetype_object_list = mimetypes_registry.lookup(mime)
       for mimetype_object in mimetype_object_list:
         if mimetype_object.extensions:
-          format = mimetype_object.extensions[0]
+          output_format = mimetype_object.extensions[0]
           break
         elif mimetype_object.globs:
-          format = mimetype_object.globs.strip('*.')
+          output_format = mimetype_object.globs.strip('*.')
           break
+    else:
+      output_format = format
 
     RESPONSE.setHeader('Content-Length', len(data))
-    if format in VALID_TEXT_FORMAT_LIST:
+    if output_format in VALID_TEXT_FORMAT_LIST:
       RESPONSE.setHeader('Content-Type', '%s; charset=utf-8' % mime)
     else:
       RESPONSE.setHeader('Content-Type', mime)
-    if format not in (VALID_TEXT_FORMAT_LIST + VALID_IMAGE_FORMAT_LIST):
+    if output_format not in (VALID_TEXT_FORMAT_LIST + VALID_IMAGE_FORMAT_LIST):
       # need to return it as attachment
       filename = self.getStandardFileName(format=format)
       RESPONSE.setHeader('Content-Disposition',