[CMF-checkins] CVS: CMF/CMFCollector - Collector.py:1.38.10.1 CollectorIssue.py:1.48.10.1 CollectorSubset.py:1.3.16.1 WebTextDocument.py:1.7.32.1 __init__.py:1.6.16.1

[Tres Seaver]

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

Modified Files:
      Tag: tseaver-ti_apb_redux-branch
	Collector.py CollectorIssue.py CollectorSubset.py 
	WebTextDocument.py __init__.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/CMFCollector/Collector.py 1.38 => 1.38.10.1 ===
--- CMF/CMFCollector/Collector.py:1.38	Thu Nov  7 09:39:29 2002
+++ CMF/CMFCollector/Collector.py	Mon Mar 10 18:49:52 2003
@@ -54,15 +54,15 @@
      'immediate_view': 'collector_edit_form',
      'actions': ({'id': 'view',
                   'name': 'Browse',
-                  'action': 'collector_contents',
+                  'action': 'string:collector_contents',
                   'permissions': (ViewCollector,)},
                  {'id': 'addissue',
                   'name': 'New Issue',
-                  'action': 'collector_add_issue_form',
+                  'action': 'string:collector_add_issue_form',
                   'permissions': (AddCollectorIssue,)},
                  {'id': 'edit',
                   'name': 'Configure',
-                  'action': 'collector_edit_form',
+                  'action': 'string:collector_edit_form',
                   'permissions': (ManageCollector,)},
                  ),
      },


=== CMF/CMFCollector/CollectorIssue.py 1.48 => 1.48.10.1 ===
--- CMF/CMFCollector/CollectorIssue.py:1.48	Thu Nov  7 16:49:11 2002
+++ CMF/CMFCollector/CollectorIssue.py	Mon Mar 10 18:49:52 2003
@@ -55,23 +55,23 @@
      'immediate_view': 'collector_edit_form',
      'actions': ({'id': 'view',
                   'name': 'View',
-                  'action': 'collector_issue_contents',
+                  'action': 'string:collector_issue_contents',
                   'permissions': (ViewCollector,)},
                  {'id': 'followup',
                   'name': 'Followup',
-                  'action': 'collector_issue_followup_form',
+                  'action': 'string:collector_issue_followup_form',
                   'permissions': (AddCollectorIssueFollowup,)},
                  {'id': 'edit',
                   'name': 'Edit',
-                  'action': 'collector_issue_edit_form',
+                  'action': 'string:collector_issue_edit_form',
                   'permissions': (EditCollectorIssue,)},
                  {'id': 'browse',
                   'name': 'Browse',
-                  'action': 'collector_issue_up',
+                  'action': 'string:collector_issue_up',
                   'permissions': (ViewCollector,)},
                  {'id': 'addIssue',
                   'name': 'New',
-                  'action': 'collector_issue_add_issue',
+                  'action': 'string:collector_issue_add_issue',
                   'permissions': (ViewCollector,)},
                  ),
      },


=== CMF/CMFCollector/CollectorSubset.py 1.3 => 1.3.16.1 ===
--- CMF/CMFCollector/CollectorSubset.py:1.3	Mon Jun 17 18:56:52 2002
+++ CMF/CMFCollector/CollectorSubset.py	Mon Mar 10 18:49:52 2003
@@ -21,17 +21,17 @@
   , 'actions'       :
     ( { 'id'        : 'view'
       , 'name'          : 'View'
-      , 'action'        : 'subset_view'
+      , 'action'        : 'string:subset_view'
       , 'permissions'   : ( View, )
       }
     , { 'id'            : 'edit'
       , 'name'          : 'Edit'
-      , 'action'        : 'subset_edit_form'
+      , 'action'        : 'string:subset_edit_form'
       , 'permissions'   : ( ModifyPortalContent, )
       }
     , { 'id'            : 'metadata'
       , 'name'          : 'Metadata'
-      , 'action'        : 'metadata_edit_form'
+      , 'action'        : 'string:metadata_edit_form'
       , 'permissions'   : ( ModifyPortalContent, )
       }
     )


=== CMF/CMFCollector/WebTextDocument.py 1.7 => 1.7.32.1 ===
--- CMF/CMFCollector/WebTextDocument.py:1.7	Mon Dec 24 12:20:28 2001
+++ CMF/CMFCollector/WebTextDocument.py	Mon Mar 10 18:49:52 2003
@@ -48,13 +48,13 @@
      'immediate_view': 'metadata_edit_form',
      # XXX May need its own forms, in order to inhibit formatting option.
      'actions': ({'name': 'View',
-                  'action': 'document_view',
+                  'action': 'string:document_view',
                   'permissions': (CMFCorePermissions.View,)},
                  {'name': 'Edit',
-                  'action': 'document_edit_form',
+                  'action': 'string:document_edit_form',
                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
                  {'name': 'Metadata',
-                  'action': 'metadata_edit_form',
+                  'action': 'string:metadata_edit_form',
                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
                  ),
      },


=== CMF/CMFCollector/__init__.py 1.6 => 1.6.16.1 ===
--- CMF/CMFCollector/__init__.py:1.6	Mon Jun 17 17:58:27 2002
+++ CMF/CMFCollector/__init__.py	Mon Mar 10 18:49:52 2003
@@ -43,12 +43,12 @@
                       'permissions': (CMFCorePermissions.View,)},
                      {'id': 'addcomment',
                       'name': 'Add Comment',
-                      'action': 'collector_transcript_comment_form',
+                      'action': 'string:collector_transcript_comment_form',
                       'permissions':
                       (CollectorPermissions.AddCollectorIssueFollowup,)},
                      {'id': 'edittranscript',
                       'name': 'Edit Transcript',
-                      'action': 'collector_transcript_edit_form',
+                      'action': 'string:collector_transcript_edit_form',
                       'permissions':
                       (CollectorPermissions.EditCollectorIssue,)},
                      ),