[Erp5-report] r35771 jm - /erp5/trunk/products/ERP5Type/patches/DemoStorage.py

[nobody at svn.erp5.org]

Author: jm
Date: Mon May 31 11:50:32 2010
New Revision: 35771

URL: http://svn.erp5.org?rev=35771&view=rev
Log:
Zope 2.8: fix manage_change_history_page with DemoStorage

Modified:
    erp5/trunk/products/ERP5Type/patches/DemoStorage.py

Modified: erp5/trunk/products/ERP5Type/patches/DemoStorage.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/DemoStorage.py?rev=35771&r1=35770&r2=35771&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/DemoStorage.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/DemoStorage.py [utf8] Mon May 31 11:50:32 2010
@@ -156,6 +156,8 @@
 
     DemoStorage.loadBefore = loadBefore
 
+    from persistent.TimeStamp import TimeStamp
+
     def history(self, oid, version=None, length=1, filter=None):
         assert not version
         self._lock_acquire()
@@ -165,12 +167,18 @@
             while length and pre:
                 oid, pre, vdata, p, tid = pre
                 assert vdata is None
-                d = {'tid': tid, 'size': len(p), 'version': ''}
+                d = {'tid': tid, 'size': len(p), 'version': '',
+                     'time': TimeStamp(tid).timeTime()}
                 if filter is None or filter(d):
                     r.append(d)
                     length -= 1
             if length:
-                r += self._base.history(oid, version, length, filter)
+                try:
+                    self._base.modifiedInVersion(oid)
+                except POSException.POSKeyError:
+                    pass
+                else:
+                    r += self._base.history(oid, version, length, filter)
             return r
         finally:
             self._lock_release()