[CMF-checkins] CVS: CMF/CMFWorkspaces - Workspace.py:1.8.4.1

[Tres Seaver]

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

Modified Files:
      Tag: tseaver-ti_apb_redux-branch
	Workspace.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/CMFWorkspaces/Workspace.py 1.8 => 1.8.4.1 ===
--- CMF/CMFWorkspaces/Workspace.py:1.8	Thu Jan  2 16:51:31 2003
+++ CMF/CMFWorkspaces/Workspace.py	Mon Mar 10 18:50:03 2003
@@ -57,32 +57,34 @@
 
 
 factory_type_information = (
-    { 'id'             : 'Workspace',
-      'meta_type'      : 'Workspace',
-      'description'    : """Workspaces are places to put temporary references
+  { 'id'             : 'Workspace'
+  , 'meta_type'      : 'Workspace'
+  , 'description'    : """\
+Workspaces are places to put temporary references
 to content you are currently working on.  Workspaces are designed to help
-you navigate efficiently.""",
-      'icon'           : 'folder_icon.gif',
-      'product'        : 'CMFWorkspaces',
-      'factory'        : 'addWorkspace',
-      'filter_content_types' : 0,
-      'immediate_view' : 'workspace_view',
-      'actions'        :
-      ({'id'            : 'view',
-        'name'          : 'Workspace',
-        'action'        : 'workspace_view',
-        'permissions'   : (View,),
-        'category'      : 'object',
-        },
-       {'id'            : 'metadata',
-        'name'          : 'Metadata',
-        'action'        : 'metadata_edit_form',
-        'permissions'   : (View,),
-        'category'      : 'object',
-        },       
-       )
-      },
-    )
+you navigate efficiently.
+"""
+  , 'icon'           : 'folder_icon.gif'
+  , 'product'        : 'CMFWorkspaces'
+  , 'factory'        : 'addWorkspace'
+  , 'filter_content_types' : 0
+  , 'immediate_view' : 'workspace_view'
+  , 'actions'        : ( { 'id'            : 'view'
+                         , 'name'          : 'Workspace'
+                         , 'action'        : 'string:workspace_view'
+                         , 'permissions'   : (View,)
+                         , 'category'      : 'object'
+                         }
+                       , { 'id'            : 'metadata'
+                         , 'name'          : 'Metadata'
+                         , 'action'        : 'string:metadata_edit_form'
+                         , 'permissions'   : (View,)
+                         , 'category'      : 'object'
+                         }
+                       )
+  }
+,
+)
 
 
 class Workspace (PortalContent.PortalContent,