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

[nobody at svn.erp5.org]

Author: fabien
Date: Wed Dec 30 11:22:01 2009
New Revision: 31532

URL: http://svn.erp5.org?rev=31532&view=rev
Log:
store cache data in the same way for all Image.py methods

Image were not stored in the same way in every methods :
in case of index_html, the image was stored, in case of convert, the image.data
was stored.
This lead to conflicts because in both cases, the cache_id was the same, so if
inded_html was first call, and after that, convert was call on the same image,
convert will return an Image object instead of image.data String.

Now in all cases, the image is stored by setConversion, and in case of convert,
only image.data is returned.

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=31532&r1=31531&r2=31532&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Wed Dec 30 11:22:01 2009
@@ -344,10 +344,11 @@
       kw = dict(display=display, format=format, quality=quality,
                 resolution=resolution, frame=frame, image_size=image_size)
       try:
-        return self.getConversion(**kw)
+        mime, image = self.getConversion(**kw)
+        return mime, image.data
       except KeyError:
         mime, image = self._makeDisplayPhoto(**kw)
-        self.setConversion(image.data, mime, **kw)
+        self.setConversion(image, mime, **kw)
         return mime, image.data
     return self.getContentType(), self.getData()