[Erp5-report] r11826 - /erp5/trunk/products/ERP5/Document/Image.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Dec 31 18:47:13 CET 2006
Author: jp
Date: Sun Dec 31 18:47:10 2006
New Revision: 11826
URL: http://svn.erp5.org?rev=11826&view=rev
Log:
Minimal level of compatibility provided with old Image class. Once an Image is viewed, it is upgraded.
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=11826&r1=11825&r2=11826&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py (original)
+++ erp5/trunk/products/ERP5/Document/Image.py Sun Dec 31 18:47:10 2006
@@ -30,6 +30,7 @@
##############################################################################
from AccessControl import ClassSecurityInfo
+from Acquisition import aq_base
from Products.CMFCore.WorkflowCore import WorkflowMethod
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
@@ -251,6 +252,16 @@
def index_html(self, REQUEST, RESPONSE, display=None, format='', quality=75, resolution=None):
"""Return the image data."""
+ # Quick hack to maintain just enough compatibility for existing sites
+ # Convert to new BTreeFolder2 based class
+ if getattr(aq_base(self), '_count', None) is None:
+ self._initBTrees()
+ # Make sure old Image objects can still be accessed
+ if not hasattr(aq_base(self), 'data') and hasattr(self, '_original'):
+ self.data = self._original.data
+ self.height = self._original.height
+ self.width = self._original.width
+
# display may be set from a cookie (?)
if (display is not None or resolution is not None or quality != 75) and defaultdisplays.has_key(display):
if not self.hasConversion(display=display, format=format,
More information about the Erp5-report
mailing list