[CMF-checkins] CVS: CMF/CMFWiki - CMFWikiPage.py:1.20.18.1 wwml.py:1.1.1.1.24.1

[Shane Hathaway]

Update of /cvs-repository/CMF/CMFWiki
In directory cvs.zope.org:/tmp/cvs-serv27999/CMFWiki

Modified Files:
      Tag: cmf-pre-1_3-branch
	CMFWikiPage.py wwml.py 
Log Message:
Merged changes from head, with a small change: the types tool does not need
to be extended in such a complex way.  I took out the type_type registry and
the __bobo_traverse__ hook and replaced it with the original code with only
minor mods that give you the same extensibility without all the hacking.
(If anyone actually wants to use the extensibility, which I suspect no one
is actually interested in doing, I will happily provide instructions and
will create a corrected unit test.)


=== CMF/CMFWiki/CMFWikiPage.py 1.20 => 1.20.18.1 ===
                )
         return fmt % ( wiki_name
-                     , quote( self.getId() )
+                     , quote( self.wiki_page_url() )
                      , action
                      , quote( wiki_name )
                      )
@@ -297,7 +297,8 @@
         # otherwise, provide a "?" creation link
         if hasattr(aq_base(folder), m): 
             # Actually contained within the folder:
-            return '<a href="%s">%s</a>' % (quote(m), m)
+            return '<a href="%s/%s">%s</a>' % (self.wiki_base_url(),
+                                               quote(m), m)
         elif hasattr(folder, m):
             obj = getattr(folder, m)
             if not hasattr(obj, 'absolute_url'):
@@ -355,7 +356,8 @@
         # it.
         elif hasattr(aq_base(folder), m):
             # Actually contained wihtin the folder:
-            return '<a href="%s">%s</a>' % (quote(m), m) + e
+            return '<a href="%s/%s">%s</a>' % (self.wiki_base_url(),
+                                               quote(m), m) + e
         elif hasattr(folder, m):
             # Obtained by acquisition - make sure to use the real URL:
             obj = getattr(folder, m)
@@ -591,7 +593,7 @@
             category = d.get(op + '-category', None)
             self.setOp(op, usernames, category)
             # Propagate to subpages if desired
-            if d.get('propagate-' + op, None) == "ON":
+            if lower(d.get('propagate-' + op, None)) == "on":
                 if offspring is None:
                     page_meta_type = self.meta_type
                     nesting = WikiNesting(self._my_folder(), page_meta_type)


=== CMF/CMFWiki/wwml.py 1.1.1.1 => 1.1.1.1.24.1 ===
     grandparent = FakeParent( None, WikiName = 0 )
 #    print translate_WMML( FakeParent( grandparent, id = 'parent' ), testString )
-    print translate_WMML( testString )
+#    print translate_WMML( testString )