Newer
Older
CMFCollector / action-string.patch
diff -uNr CMFCollector-orig/CollectorIssue.py CMFCollector/CollectorIssue.py
--- CMFCollector-orig/CollectorIssue.py	2003-05-27 16:39:09.000000000 +0100
+++ CMFCollector/CollectorIssue.py	2003-11-13 16:20:02.000000000 +0000
@@ -55,24 +55,24 @@
      'immediate_view': 'collector_edit_form',
      'actions': ({'id': 'view',
                   'name': 'View',
-                  'action': 'string:${object_url}/collector_issue_contents',
+                  'action': 'collector_issue_contents',
                   'permissions': (ViewCollector,)},
                  {'id': 'followup',
                   'name': 'Followup',
                   'action':
-                         'string:${object_url}/collector_issue_followup_form',
+                         'collector_issue_followup_form',
                   'permissions': (AddCollectorIssueFollowup,)},
                  {'id': 'edit',
                   'name': 'Edit',
-                  'action': 'string:${object_url}/collector_issue_edit_form',
+                  'action': 'collector_issue_edit_form',
                   'permissions': (EditCollectorIssue,)},
                  {'id': 'browse',
                   'name': 'Browse',
-                  'action': 'string:${object_url}/collector_issue_up',
+                  'action': 'collector_issue_up',
                   'permissions': (ViewCollector,)},
                  {'id': 'addIssue',
                   'name': 'New',
-                  'action': 'string:${object_url}/collector_issue_add_issue',
+                  'action': 'collector_issue_add_issue',
                   'permissions': (ViewCollector,)},
                  ),
      },
diff -uNr CMFCollector-orig/Collector.py CMFCollector/Collector.py
--- CMFCollector-orig/Collector.py	2003-05-09 22:40:22.000000000 +0100
+++ CMFCollector/Collector.py	2003-11-13 16:20:02.000000000 +0000
@@ -54,15 +54,15 @@
      'immediate_view': 'collector_edit_form',
      'actions': ({'id': 'view',
                   'name': 'Browse',
-                  'action': 'string:${object_url}/collector_contents',
+                  'action': 'collector_contents',
                   'permissions': (ViewCollector,)},
                  {'id': 'addissue',
                   'name': 'New Issue',
-                  'action': 'string:${object_url}/collector_add_issue_form',
+                  'action': 'collector_add_issue_form',
                   'permissions': (AddCollectorIssue,)},
                  {'id': 'edit',
                   'name': 'Configure',
-                  'action': 'string:${object_url}/collector_edit_form',
+                  'action': 'collector_edit_form',
                   'permissions': (ManageCollector,)},
                  ),
      },
diff -uNr CMFCollector-orig/CollectorSubset.py CMFCollector/CollectorSubset.py
--- CMFCollector-orig/CollectorSubset.py	2003-05-09 22:40:22.000000000 +0100
+++ CMFCollector/CollectorSubset.py	2003-11-13 16:20:02.000000000 +0000
@@ -21,17 +21,17 @@
   , 'actions'       :
     ( { 'id'        : 'view'
       , 'name'          : 'View'
-      , 'action'        : 'string:${object_url}/subset_view'
+      , 'action'        : 'subset_view'
       , 'permissions'   : ( View, )
       }
     , { 'id'            : 'edit'
       , 'name'          : 'Edit'
-      , 'action'        : 'string:${object_url}/subset_edit_form'
+      , 'action'        : 'subset_edit_form'
       , 'permissions'   : ( ModifyPortalContent, )
       }
     , { 'id'            : 'metadata'
       , 'name'          : 'Metadata'
-      , 'action'        : 'string:${object_url}/metadata_edit_form'
+      , 'action'        : 'metadata_edit_form'
       , 'permissions'   : ( ModifyPortalContent, )
       }
     )
diff -uNr CMFCollector-orig/__init__.py CMFCollector/__init__.py
--- CMFCollector-orig/__init__.py	2003-05-09 22:40:22.000000000 +0100
+++ CMFCollector/__init__.py	2003-11-13 16:20:02.000000000 +0000
@@ -40,18 +40,18 @@
          'actions': (
                { 'id': 'view',
                  'name': 'View',
-                 'action': 'string:${object_url}/../',
+                 'action': '../',
                  'permissions': (CMFCorePermissions.View,) },
                { 'id': 'addcomment',
                  'name': 'Add Comment',
                  'action':
-                     'string:${object_url}/collector_transcript_comment_form',
+                     'collector_transcript_comment_form',
                  'permissions':
                           (CollectorPermissions.AddCollectorIssueFollowup,) },
                { 'id': 'edittranscript',
                  'name': 'Edit Transcript',
                  'action':
-                        'string:${object_url}/collector_transcript_edit_form',
+                        'collector_transcript_edit_form',
                  'permissions': (CollectorPermissions.EditCollectorIssue,) },
              ),
          },
diff -uNr CMFCollector-orig/WebTextDocument.py CMFCollector/WebTextDocument.py
--- CMFCollector-orig/WebTextDocument.py	2003-05-09 22:40:22.000000000 +0100
+++ CMFCollector/WebTextDocument.py	2003-11-13 16:20:02.000000000 +0000
@@ -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:${object_url}/document_view',
+                  'action': 'document_view',
                   'permissions': (CMFCorePermissions.View,)},
                  {'name': 'Edit',
-                  'action': 'string:${object_url}/document_edit_form',
+                  'action': 'document_edit_form',
                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
                  {'name': 'Metadata',
-                  'action': 'string:${object_url}/metadata_edit_form',
+                  'action': 'metadata_edit_form',
                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
                  ),
      },