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

[nobody at svn.erp5.org]

Author: jm
Date: Wed Sep 30 18:28:26 2009
New Revision: 29338

URL: http://svn.erp5.org?rev=29338&view=rev
Log:
Fix caching of images

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=29338&r1=29337&r2=29338&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Wed Sep 30 18:28:26 2009
@@ -345,17 +345,13 @@
     image_size = self.getSizeFromImageDisplay(display)
     if (display is not None or resolution is not None or quality != 75 or format != ''\
                             or frame is not None) and image_size:
+      kw = dict(display=display, format=format, quality=quality,
+                resolution=resolution, frame=frame, image_size=image_size)
       try:
-        return self.getConversion(display=display, format=format,
-                                  quality=quality, resolution=resolution,
-                                  frame=frame, image_size=image_size)
+        return self.getConversion(**kw)
       except KeyError:
-        mime, image = self._makeDisplayPhoto(display, format=format, quality=quality,
-                                             resolution=resolution, frame=frame,
-                                             image_size=image_size)
-        self.setConversion(image.data, mime, format=format, quality=quality,
-                           resolution=resolution, frame=frame,
-                           image_size=image_size)
+        mime, image = self._makeDisplayPhoto(**kw)
+        self.setConversion(image.data, mime, **kw)
         return mime, image.data
     return self.getContentType(), self.getData()