[CMF-checkins] CVS: CMF - CMFWikiPage.py:1.3

[Ken Manheimer]

Update of /cvs-repository/Packages/Products/CMFWiki
In directory korak.digicool.com:/tmp/cvs-serv23600

Modified Files:
	CMFWikiPage.py 
Log Message:
.__init__(): Need to have an __init__ so we can do the
DefaultDublinCoreImpl initialization.  We're also explicitly doing the
DTMLDocument __init__.  XXX We might should not be using DTMLDocument,
using the Portal Document instead, but i really don't know, and am
punting at the moment.

Importing html_quote from DocumentTemplate.DT_Util - it's not
available from pre-Zope 2.4 StructuredText, and i expect it is from
2.4 DocumentTemplate.DT_Util.

factory_type_information: Added an entry for page_recent_wiki_changes,
which kicks up to the folder's recent_wiki_changes method.

.get_ancestors(): Deleted a debugging print.

Escaped a leading paren in the module docstring for emacs python mode
sanity.



--- Updated File CMFWikiPage.py in package CMF --
--- CMFWikiPage.py	2001/05/24 19:11:10	1.2
+++ CMFWikiPage.py	2001/05/26 00:54:01	1.3
@@ -2,7 +2,7 @@
 The code in this module is available under the GPL.
 All rights reserved, all disclaimers apply, etc.
 
-(c) 1999,2000 Simon Michael <simon@joyful.com>
+\(c) 1999,2000 Simon Michael <simon@joyful.com>
 Parenting code and regulations by Ken Manheimer (klm@digicool.com)
 Integrated into Zope CMF by Chris McDonough (chrism@digicool.com)
 """
@@ -14,7 +14,8 @@
 from OFS.DTMLDocument import DTMLDocument
 from OFS.Image import cookId
 from urllib import quote, unquote     # url quoting
-from StructuredText import html_with_references, html_quote
+from StructuredText import html_with_references #, html_quote
+from DocumentTemplate.DT_Util import html_quote
 from wwml import translate_WMML
 from string import split,join,find,lstrip,lower
 import Acquisition
@@ -102,6 +103,10 @@
     set(CMFWikiPermissions.Comment, ('Owner', 'Manager', 'Authenticated'))
     set = None
 
+    def __init__(self, file, __name__):
+        DTMLDocument.__init__(self, file, mapping=None, __name__=__name__)
+        DefaultDublinCoreImpl.__init__(self)
+
     security.declarePublic('getId')
     def getId(self):
         try: return self.id()
@@ -1123,7 +1128,6 @@
 
         See the WikiNesting docstring for nestings structure description."""
         container = self._my_folder()
-        print container
         allpages = container.objectIds(spec=self.meta_type)
         ancestors = {}
         offspring = {}
@@ -1742,6 +1746,14 @@
                  {'id': 'wikihelp',
                   'name': 'WikiHelp',
                   'action': 'view_wiki_help',
+                  'permissions': (CMFWikiPermissions.View,)},
+                 {'id': 'toc',
+                  'name': 'Wiki Contents',
+                  'action':'page_get_wiki_toc',
+                  'permissions': (CMFWikiPermissions.View,)},
+                 {'id': 'recent_changes',
+                  'name': 'Recent Changes',
+                  'action':'page_recent_wiki_changes',
                   'permissions': (CMFWikiPermissions.View,)},
                  ),
      },