[CMF-checkins] CVS: CMF/CMFTopic - Topic.py:1.31.10.1

[Tres Seaver]

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

Modified Files:
      Tag: tseaver-ti_apb_redux-branch
	Topic.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/CMFTopic/Topic.py 1.31 => 1.31.10.1 ===
--- CMF/CMFTopic/Topic.py:1.31	Sat Aug  3 22:31:31 2002
+++ CMF/CMFTopic/Topic.py	Mon Mar 10 18:50:00 2003
@@ -30,8 +30,8 @@
 
 # Factory type information -- makes Topic objects play nicely
 # with the Types Tool (portal_types )
-factory_type_information = \
-( { 'id'                : 'Topic'
+factory_type_information = (
+  { 'id'                : 'Topic'
   , 'content_icon'      : 'topic_icon.gif'
   , 'meta_type'         : 'Portal Topic'
   , 'description'       : 'Topics are canned queries for organizing content '
@@ -39,28 +39,27 @@
   , 'product'           : 'CMFTopic'
   , 'factory'           : 'addTopic'
   , 'immediate_view'    : 'topic_edit_form'
-  , 'actions'           :
-    ( { 'id'            : 'view'
-      , 'name'          : 'View'
-      , 'action'        : 'topic_view'
-      , 'permissions'   : (View,)
-      }
-    , { 'id'            : 'edit'
-      , 'name'          : 'Edit'
-      , 'action'        : 'topic_edit_form'
-      , 'permissions'   : (ChangeTopics,)
-      }
-    , { 'id'            : 'criteria'
-      , 'name'          : 'Criteria'
-      , 'action'        : 'topic_criteria_form'
-      , 'permissions'   : (ChangeTopics,)
-      }
-    , { 'id'            : 'subtopics'
-      , 'name'          : 'Subtopics'
-      , 'action'        : 'topic_subtopics_form'
-      , 'permissions'   : (ChangeTopics,)
-      }
-    )
+  , 'actions'           : ( { 'id'            : 'view'
+                            , 'name'          : 'View'
+                            , 'action'        : 'string:topic_view'
+                            , 'permissions'   : (View,)
+                            }
+                          , { 'id'            : 'edit'
+                            , 'name'          : 'Edit'
+                            , 'action'        : 'string:topic_edit_form'
+                            , 'permissions'   : (ChangeTopics,)
+                            }
+                          , { 'id'            : 'criteria'
+                            , 'name'          : 'Criteria'
+                            , 'action'        : 'string:topic_criteria_form'
+                            , 'permissions'   : (ChangeTopics,)
+                            }
+                          , { 'id'            : 'subtopics'
+                            , 'name'          : 'Subtopics'
+                            , 'action'        : 'string:topic_subtopics_form'
+                            , 'permissions'   : (ChangeTopics,)
+                            }
+                          )
   }
 ,
 )