diff --git a/CMFCollector/Collector.py b/CMFCollector/Collector.py index 3264577..f11c5d1 100644 --- a/CMFCollector/Collector.py +++ b/CMFCollector/Collector.py @@ -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 --git a/CMFCollector/CollectorIssue.py b/CMFCollector/CollectorIssue.py index ade6365..36287ae 100644 --- a/CMFCollector/CollectorIssue.py +++ b/CMFCollector/CollectorIssue.py @@ -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 --git a/CMFCollector/CollectorSubset.py b/CMFCollector/CollectorSubset.py index 9bc601b..88b26e4 100644 --- a/CMFCollector/CollectorSubset.py +++ b/CMFCollector/CollectorSubset.py @@ -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 --git a/CMFCollector/WebTextDocument.py b/CMFCollector/WebTextDocument.py index 0a9b1f5..abf1cfb 100644 --- a/CMFCollector/WebTextDocument.py +++ b/CMFCollector/WebTextDocument.py @@ -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,)}, ), }, diff --git a/CMFCollector/__init__.py b/CMFCollector/__init__.py index 2268fbf..35c3a46 100644 --- a/CMFCollector/__init__.py +++ b/CMFCollector/__init__.py @@ -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,) }, ), },