[Erp5-report] r29019 - /erp5/trunk/products/ERP5/Document/Image.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Mon Sep 14 10:58:50 2009
New Revision: 29019

URL: http://svn.erp5.org?rev=29019&view=rev
Log:
Do not call setConversion in _makeDisplayPhoto method, as it is not a concern of this method

Modified:
    erp5/trunk/products/ERP5/Document/Image.py

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=29019&r1=29018&r2=29019&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Mon Sep 14 10:58:50 2009
@@ -397,6 +397,9 @@
         mime, image = self._makeDisplayPhoto(display, format=format, quality=quality,
                                              resolution=resolution, frame=frame,
                                              image_size=image_size)
+        self.setConversion(image, mime, format=format, quality=quality,
+                           resolution=resolution, frame=frame,
+                           image_size=image_size)
       RESPONSE.setHeader('Content-Type', mime)
       return image.index_html(REQUEST, RESPONSE)
 
@@ -491,10 +494,6 @@
     image = self._getDisplayPhoto(display, format=format, quality=quality,
                                            resolution=resolution, frame=frame,
                                            image_size=image_size)
-    self.setConversion(image, mime=image.content_type,
-                              display=display, format=format,
-                              quality=quality, resolution=resolution,
-                              frame=frame, image_size=image_size)
     return (image.content_type, aq_base(image))
 
   def _getAspectRatioSize(self, width, height):