[CMF-checkins] CVS: CMF - CatalogTool.py:1.9 DynamicType.py:1.6

[Martijn Pieters]

Update of /cvs-repository/CMF/CMFCore
In directory korak:/tmp/cvs-serv6594/CMFCore

Modified Files:
	CatalogTool.py DynamicType.py 
Log Message:
Merge getId changes from branch.



--- Updated File CatalogTool.py in package CMF --
--- CatalogTool.py	2001/04/08 19:18:09	1.8
+++ CatalogTool.py	2001/04/09 20:21:05	1.9
@@ -170,7 +170,7 @@
         self._catalog.addColumn('review_state')
         self._catalog.addColumn('Creator')
         self._catalog.addColumn('Date')
-        self._catalog.addColumn('icon')
+        self._catalog.addColumn('getIcon')
         self._catalog.addColumn('created')
         self._catalog.addColumn('effective')
         self._catalog.addColumn('expires')

--- Updated File DynamicType.py in package CMF --
--- DynamicType.py	2001/04/04 01:58:53	1.5
+++ DynamicType.py	2001/04/09 20:21:05	1.6
@@ -151,6 +151,6 @@
         return 'misc_/OFSP/dtmldoc.gif'
 
     security.declarePublic('icon')
-    icon = getIcon  # For the ZMI and the catalog.
+    icon = getIcon  # For the ZMI
 
 Globals.InitializeClass (DynamicType)