[CMF-checkins] CVS: CMF/CMFCollector - Collector.py:1.39.4.1 CollectorIssue.py:1.50.4.1 CollectorSubset.py:1.4.4.1 WebTextDocument.py:1.8.4.1 __init__.py:1.7.4.1

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-collector152-branch
	Collector.py CollectorIssue.py CollectorSubset.py 
	WebTextDocument.py __init__.py 
Log Message:
updated fti actions

=== CMF/CMFCollector/Collector.py 1.39 => 1.39.4.1 ===
--- CMF/CMFCollector/Collector.py:1.39	Tue Apr 15 12:08:00 2003
+++ CMF/CMFCollector/Collector.py	Thu May  8 16:04:46 2003
@@ -54,15 +54,15 @@
      'immediate_view': 'collector_edit_form',
      'actions': ({'id': 'view',
                   'name': 'Browse',
-                  'action': 'string:collector_contents',
+                  'action': 'string:${object_url}/collector_contents',
                   'permissions': (ViewCollector,)},
                  {'id': 'addissue',
                   'name': 'New Issue',
-                  'action': 'string:collector_add_issue_form',
+                  'action': 'string:${object_url}/collector_add_issue_form',
                   'permissions': (AddCollectorIssue,)},
                  {'id': 'edit',
                   'name': 'Configure',
-                  'action': 'string:collector_edit_form',
+                  'action': 'string:${object_url}/collector_edit_form',
                   'permissions': (ManageCollector,)},
                  ),
      },


=== CMF/CMFCollector/CollectorIssue.py 1.50 => 1.50.4.1 ===
--- CMF/CMFCollector/CollectorIssue.py:1.50	Tue Apr 15 12:08:00 2003
+++ CMF/CMFCollector/CollectorIssue.py	Thu May  8 16:04:46 2003
@@ -55,23 +55,24 @@
      'immediate_view': 'collector_edit_form',
      'actions': ({'id': 'view',
                   'name': 'View',
-                  'action': 'string:collector_issue_contents',
+                  'action': 'string:${object_url}/collector_issue_contents',
                   'permissions': (ViewCollector,)},
                  {'id': 'followup',
                   'name': 'Followup',
-                  'action': 'string:collector_issue_followup_form',
+                  'action':
+                         'string:${object_url}/collector_issue_followup_form',
                   'permissions': (AddCollectorIssueFollowup,)},
                  {'id': 'edit',
                   'name': 'Edit',
-                  'action': 'string:collector_issue_edit_form',
+                  'action': 'string:${object_url}/collector_issue_edit_form',
                   'permissions': (EditCollectorIssue,)},
                  {'id': 'browse',
                   'name': 'Browse',
-                  'action': 'string:collector_issue_up',
+                  'action': 'string:${object_url}/collector_issue_up',
                   'permissions': (ViewCollector,)},
                  {'id': 'addIssue',
                   'name': 'New',
-                  'action': 'string:collector_issue_add_issue',
+                  'action': 'string:${object_url}/collector_issue_add_issue',
                   'permissions': (ViewCollector,)},
                  ),
      },


=== CMF/CMFCollector/CollectorSubset.py 1.4 => 1.4.4.1 ===
--- CMF/CMFCollector/CollectorSubset.py:1.4	Tue Apr 15 12:08:00 2003
+++ CMF/CMFCollector/CollectorSubset.py	Thu May  8 16:04:46 2003
@@ -21,17 +21,17 @@
   , 'actions'       :
     ( { 'id'        : 'view'
       , 'name'          : 'View'
-      , 'action'        : 'string:subset_view'
+      , 'action'        : 'string:${object_url}/subset_view'
       , 'permissions'   : ( View, )
       }
     , { 'id'            : 'edit'
       , 'name'          : 'Edit'
-      , 'action'        : 'string:subset_edit_form'
+      , 'action'        : 'string:${object_url}/subset_edit_form'
       , 'permissions'   : ( ModifyPortalContent, )
       }
     , { 'id'            : 'metadata'
       , 'name'          : 'Metadata'
-      , 'action'        : 'string:metadata_edit_form'
+      , 'action'        : 'string:${object_url}/metadata_edit_form'
       , 'permissions'   : ( ModifyPortalContent, )
       }
     )


=== CMF/CMFCollector/WebTextDocument.py 1.8 => 1.8.4.1 ===
--- CMF/CMFCollector/WebTextDocument.py:1.8	Tue Apr 15 12:08:00 2003
+++ CMF/CMFCollector/WebTextDocument.py	Thu May  8 16:04:46 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': 'string:document_view',
+                  'action': 'string:${object_url}/document_view',
                   'permissions': (CMFCorePermissions.View,)},
                  {'name': 'Edit',
-                  'action': 'string:document_edit_form',
+                  'action': 'string:${object_url}/document_edit_form',
                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
                  {'name': 'Metadata',
-                  'action': 'string:metadata_edit_form',
+                  'action': 'string:${object_url}/metadata_edit_form',
                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
                  ),
      },


=== CMF/CMFCollector/__init__.py 1.7 => 1.7.4.1 ===
--- CMF/CMFCollector/__init__.py:1.7	Tue Apr 15 12:08:00 2003
+++ CMF/CMFCollector/__init__.py	Thu May  8 16:04:46 2003
@@ -37,21 +37,23 @@
          'factory': None,               # So not included in 'New' add form
          'allowed_content_types': None,
          'immediate_view': 'collector_transcript_view',
-         'actions': ({'id': 'view',
-                      'name': 'View',
-                      'action': '../',
-                      'permissions': (CMFCorePermissions.View,)},
-                     {'id': 'addcomment',
-                      'name': 'Add Comment',
-                      'action': 'string:collector_transcript_comment_form',
-                      'permissions':
-                      (CollectorPermissions.AddCollectorIssueFollowup,)},
-                     {'id': 'edittranscript',
-                      'name': 'Edit Transcript',
-                      'action': 'string:collector_transcript_edit_form',
-                      'permissions':
-                      (CollectorPermissions.EditCollectorIssue,)},
-                     ),
+         'actions': (
+               { 'id': 'view',
+                 'name': 'View',
+                 'action': 'string:${object_url}/../',
+                 'permissions': (CMFCorePermissions.View,) },
+               { 'id': 'addcomment',
+                 'name': 'Add Comment',
+                 'action':
+                     'string:${object_url}/collector_transcript_comment_form',
+                 'permissions':
+                          (CollectorPermissions.AddCollectorIssueFollowup,) },
+               { 'id': 'edittranscript',
+                 'name': 'Edit Transcript',
+                 'action':
+                        'string:${object_url}/collector_transcript_edit_form',
+                 'permissions': (CollectorPermissions.EditCollectorIssue,) },
+             ),
          },
         )
      )