[CMF-checkins] CVS: CMF/CMFWiki - CMFWikiPage.py:1.31

Yvo Schubbe schubbe@web.de
Fri, 9 May 2003 17:40:56 -0400


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

Modified Files:
	CMFWikiPage.py 
Log Message:
Merged yuppie-collector152-branch:
- Made type actions absolute URLs by default. (Collector #152)

=== CMF/CMFWiki/CMFWikiPage.py 1.30 => 1.31 ===
--- CMF/CMFWiki/CMFWikiPage.py:1.30	Tue Apr 15 12:08:05 2003
+++ CMF/CMFWiki/CMFWikiPage.py	Fri May  9 17:40:25 2003
@@ -1799,104 +1799,108 @@
 
 
 factory_type_information = (
-  { 'id'                : 'CMF Wiki Page'
-  , 'content_icon'      : 'wikipage_icon.gif'
-  , 'meta_type'         : 'CMF Wiki Page'
-  , 'product'           : 'CMFWiki'
-  , 'factory'           : 'addCMFWikiPage'
-  , 'immediate_view'    : 'wikipage_view'
-  , 'actions'           : ( { 'id': 'view'
-                            , 'name': 'View'
-                            , 'action': 'string:wikipage_view'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'comment'
-                            , 'name': 'Comment'
-                            , 'action': 'string:wikipage_comment_form'
-                            , 'permissions': (CMFWikiPermissions.Comment,)
-                            }
-                          , { 'id': 'edit'
-                            , 'name': 'Edit'
-                            , 'action': 'string:wikipage_edit_form'
-                            , 'permissions': (CMFWikiPermissions.Edit,)
-                            }
-                          , { 'id': 'history'
-                            , 'name': 'History'
-                            , 'action': 'string:wikipage_history'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'backlinks'
-                            , 'name': 'Backlinks'
-                            , 'action': 'string:wikipage_backlinks'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'advanced'
-                            , 'name': 'Advanced'
-                            , 'action': 'string:wikipage_advanced_form'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'toc'
-                            , 'name': 'Wiki Contents'
-                            , 'category': 'folder'
-                            , 'action': 'string:wikipage_toc'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'recent_changes'
-                            , 'name': 'Recent Changes'
-                            , 'category': 'folder'
-                            , 'action': 'string:wikipage_recentchanges'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'create'
-                            , 'name': 'Create'
-                            , 'category': 'folder'
-                            , 'action': 'string:wikipage_create_form'
-                            , 'permissions': (CMFWikiPermissions.Create,)
-                            , 'visible': 0
-                            }
-                          )
+  { 'id'             : 'CMF Wiki Page'
+  , 'content_icon'   : 'wikipage_icon.gif'
+  , 'meta_type'      : 'CMF Wiki Page'
+  , 'product'        : 'CMFWiki'
+  , 'factory'        : 'addCMFWikiPage'
+  , 'immediate_view' : 'wikipage_view'
+  , 'actions'        : ( { 'id': 'view'
+                         , 'name': 'View'
+                         , 'action': 'string:${object_url}/wikipage_view'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'comment'
+                         , 'name': 'Comment'
+                         , 'action':
+                                  'string:${object_url}/wikipage_comment_form'
+                         , 'permissions': (CMFWikiPermissions.Comment,)
+                         }
+                       , { 'id': 'edit'
+                         , 'name': 'Edit'
+                         , 'action': 'string:${object_url}/wikipage_edit_form'
+                         , 'permissions': (CMFWikiPermissions.Edit,)
+                         }
+                       , { 'id': 'history'
+                         , 'name': 'History'
+                         , 'action': 'string:${object_url}/wikipage_history'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'backlinks'
+                         , 'name': 'Backlinks'
+                         , 'action': 'string:${object_url}/wikipage_backlinks'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'advanced'
+                         , 'name': 'Advanced'
+                         , 'action':
+                                 'string:${object_url}/wikipage_advanced_form'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'toc'
+                         , 'name': 'Wiki Contents'
+                         , 'category': 'folder'
+                         , 'action': 'string:${object_url}/wikipage_toc'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'recent_changes'
+                         , 'name': 'Recent Changes'
+                         , 'category': 'folder'
+                         , 'action':
+                                 'string:${object_url}/wikipage_recentchanges'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'create'
+                         , 'name': 'Create'
+                         , 'category': 'folder'
+                         , 'action':
+                                   'string:${object_url}/wikipage_create_form'
+                         , 'permissions': (CMFWikiPermissions.Create,)
+                         , 'visible': 0
+                         }
+                       )
   }
 ,
-  { 'id'                : 'CMF Wiki'
-  , 'content_icon'      : 'folder_icon.gif'
-  , 'meta_type'         : 'CMF Wiki'
-  , 'description'       : """
+  { 'id'             : 'CMF Wiki'
+  , 'content_icon'   : 'folder_icon.gif'
+  , 'meta_type'      : 'CMF Wiki'
+  , 'description'    : """
 Loosely organized (yet structured) content can be added to Wikis.
 """
-  , 'product'           : 'CMFWiki'
-  , 'factory'           : 'addCMFWikiFolder'
-  , 'immediate_view'    : 'FrontPage'
-  , 'actions'           : ( { 'id': 'toc'
-                            , 'name': 'Wiki Contents'
-                            , 'category': 'folder'
-                            , 'action': 'string:wiki_toc'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'view'
-                            , 'name': 'FrontPage'
-                            , 'category': 'folder'
-                            , 'action': 'string:FrontPage'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'all'
-                            , 'name': 'All Pages'
-                            , 'category': 'folder'
-                            , 'action': 'string:wiki_allpages'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'recent_changes'
-                            , 'name': 'Recent Changes'
-                            , 'category': 'folder'
-                            , 'action': 'string:wiki_recentchanges'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          , { 'id': 'wikihelp'
-                            , 'name': 'WikiHelp'
-                            , 'category': 'folder'
-                            , 'action': 'string:WikiHelp'
-                            , 'permissions': (CMFWikiPermissions.View,)
-                            }
-                          )
+  , 'product'        : 'CMFWiki'
+  , 'factory'        : 'addCMFWikiFolder'
+  , 'immediate_view' : 'FrontPage'
+  , 'actions'        : ( { 'id': 'toc'
+                         , 'name': 'Wiki Contents'
+                         , 'category': 'folder'
+                         , 'action': 'string:${object_url}/wiki_toc'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'view'
+                         , 'name': 'FrontPage'
+                         , 'category': 'folder'
+                         , 'action': 'string:${object_url}/FrontPage'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'all'
+                         , 'name': 'All Pages'
+                         , 'category': 'folder'
+                         , 'action': 'string:${object_url}/wiki_allpages'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'recent_changes'
+                         , 'name': 'Recent Changes'
+                         , 'category': 'folder'
+                         , 'action': 'string:${object_url}/wiki_recentchanges'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       , { 'id': 'wikihelp'
+                         , 'name': 'WikiHelp'
+                         , 'category': 'folder'
+                         , 'action': 'string:${object_url}/WikiHelp'
+                         , 'permissions': (CMFWikiPermissions.View,)
+                         }
+                       )
   }
 )