[CMF-checkins] CVS: CMF - Topic.py:1.16

[Martijn Pieters]

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

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



--- Updated File Topic.py in package CMF --
--- Topic.py	2001/04/08 19:18:21	1.15
+++ Topic.py	2001/04/09 20:21:06	1.16
@@ -157,7 +157,7 @@
 
     security.declareProtected(CMFCorePermissions.View, 'icon')
     def icon(self):
-        """ For the ZMI and Catalog """
+        """ For the ZMI """
         return self.getIcon()
     
     def _index_html(self):
@@ -351,3 +351,13 @@
 
 # Intialize the Topic class, setting up security.
 InitializeClass(Topic)
+
+# Waah.  This seems to be the only way to get the icon in correctly
+##from Products.CMFCore.register import registerPortalContent
+##registerPortalContent(
+##    Topic,
+##    meta_type='Portal Topic',
+##    icon = 'images/topic.gif',
+##    permission = TopicPermissions.AddTopics,
+##    productGlobals = globals(),
+##    )