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

Tres Seaver tseaver@zope.com
Mon, 10 Mar 2003 18:50:34 -0500


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

Modified Files:
      Tag: tseaver-ti_apb_redux-branch
	CMFWikiPage.py 
Log Message:


  Landing 'tseaver-typeinfo_as_apb-branch' against current HEAD, using
  a new integration branch:

  - Merged the branch and fixed up all conflicts;  all tests pass.

  - Updated all the 'factory_type_information' structures to make the
    'action' key a TALES expression (e.g., "document_view" ->
    "string:document_view").

  Remaining TODOs:

  - Write an external method for converting existing type info objects
    (they all have dictionaries, instead of ActionInformation objects,
    stored in the ZODB).  Otherwise, all existing type info objects are
    *toast*.

  - Perhaps someone can think of a clever way to avoid the need for this
    conversion?


=== CMF/CMFWiki/CMFWikiPage.py 1.29 => 1.29.10.1 ===
--- CMF/CMFWiki/CMFWikiPage.py:1.29	Tue Nov  5 12:25:42 2002
+++ CMF/CMFWiki/CMFWikiPage.py	Mon Mar 10 18:50:02 2003
@@ -1799,91 +1799,107 @@
 
 
 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': 'wikipage_view',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'comment',
-                  'name': 'Comment',
-                  'action': 'wikipage_comment_form',
-                  'permissions': (CMFWikiPermissions.Comment,)},
-                 {'id': 'edit',
-                  'name': 'Edit',
-                  'action': 'wikipage_edit_form',
-                  'permissions': (CMFWikiPermissions.Edit,)},
-                 {'id': 'history',
-                  'name': 'History',
-                  'action': 'wikipage_history',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'backlinks',
-                  'name': 'Backlinks',
-                  'action': 'wikipage_backlinks',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'advanced',
-                  'name': 'Advanced',
-                  'action': 'wikipage_advanced_form',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'toc',
-                  'name': 'Wiki Contents',
-                  'category': 'folder',
-                  'action':'wikipage_toc',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'recent_changes',
-                  'name': 'Recent Changes',
-                  'category': 'folder',
-                  'action':'wikipage_recentchanges',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'create',
-                  'name': 'Create',
-                  'category': 'folder',
-                  'action':'wikipage_create_form',
-                  'permissions': (CMFWikiPermissions.Create,),
-                  'visible': 0 },
-                 ),
-     },
-    {'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':'wiki_toc',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'view',
-                  'name': 'FrontPage',
-                  'category': 'folder',
-                  'action':'FrontPage',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'all',
-                  'name': 'All Pages',
-                  'category': 'folder',
-                  'action':'wiki_allpages',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'recent_changes',
-                  'name': 'Recent Changes',
-                  'category': 'folder',
-                  'action':'wiki_recentchanges',
-                  'permissions': (CMFWikiPermissions.View,)},
-                 {'id': 'wikihelp',
-                  'name': 'WikiHelp',
-                  'category': 'folder',
-                  'action': 'WikiHelp',
-                  'permissions': (CMFWikiPermissions.View,)}
-                 ),
-     },
-    )
-     
+  { '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'
+  , '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,)
+                            }
+                          )
+  }
+)
+ 
 default_perms = {
     'create': 'nonanon',
     'edit': 'nonanon',