[Erp5-report] r12544 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Feb 4 15:13:57 CET 2007
Author: jerome
Date: Sun Feb 4 15:13:54 2007
New Revision: 12544
URL: http://svn.erp5.org?rev=12544&view=rev
Log:
quick history support for SQLCatalog.
Modified:
erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=12544&r1=12543&r2=12544&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Sun Feb 4 15:13:54 2007
@@ -16,6 +16,7 @@
import Acquisition
import ExtensionClass
import Globals
+import OFS.History
from Globals import DTMLFile, PersistentMapping
from string import lower, split, join
from thread import allocate_lock, get_ident
@@ -38,6 +39,7 @@
import sys
import urllib
import string
+import pprint
from cStringIO import StringIO
from xml.dom.minidom import parse, parseString, getDOMImplementation
from xml.sax.saxutils import escape, quoteattr
@@ -387,7 +389,11 @@
allow_class(ComplexQuery)
-class Catalog(Folder, Persistent, Acquisition.Implicit, ExtensionClass.Base):
+class Catalog( Folder,
+ Persistent,
+ Acquisition.Implicit,
+ ExtensionClass.Base,
+ OFS.History.Historical ):
""" An Object Catalog
An Object Catalog maintains a table of object metadata, and a
@@ -452,7 +458,7 @@
{'label': 'Ownership', # TAB: Ownership
'action': 'manage_owner',
'help': ('OFSP','Ownership.stx'),}
- )
+ ) + OFS.History.Historical.manage_options
__ac_permissions__=(
@@ -806,6 +812,14 @@
doc.unlink()
finally:
f.close()
+
+ def manage_historyCompare(self, rev1, rev2, REQUEST,
+ historyComparisonResults=''):
+ return Catalog.inheritedAttribute('manage_historyCompare')(
+ self, rev1, rev2, REQUEST,
+ historyComparisonResults=OFS.History.html_diff(
+ pprint.pformat(rev1.__dict__),
+ pprint.pformat(rev2.__dict__)))
def _clearSecurityCache(self):
self.security_uid_dict = OIBTree()
More information about the Erp5-report
mailing list