[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_content - document_edit_control.py:1.2 newsitem_edit_control.py:1.2

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFDefault/skins/zpt_content
In directory cvs.zope.org:/tmp/cvs-serv25432/CMFDefault/skins/zpt_content

Modified Files:
	document_edit_control.py newsitem_edit_control.py 
Log Message:
- replaced some getActionInfo calls by the new getActionInfo method of DynamicType
- added a fallback to 'folder/view' for folderish subobjects that don't have a 'folder/folderContents' action in portal_actions


=== CMF/CMFDefault/skins/zpt_content/document_edit_control.py 1.1 => 1.2 ===
--- CMF/CMFDefault/skins/zpt_content/document_edit_control.py:1.1	Tue Jan 20 17:30:52 2004
+++ CMF/CMFDefault/skins/zpt_content/document_edit_control.py	Thu Feb  5 09:45:37 2004
@@ -43,8 +43,7 @@
             message = 'Document changed.'
 
     if ok and change_and_view:
-        ti = context.getTypeInfo()
-        target = ti.getActionInfo('object/view', context)['url']
+        target = context.getActionInfo('object/view')['url']
         query = make_query(portal_status_message=message)
         context.REQUEST.RESPONSE.redirect( '%s?%s' % (target, query) )
         return None
@@ -56,8 +55,7 @@
 control = {}
 
 buttons = []
-ti = context.getTypeInfo()
-target = ti.getActionInfo('object/edit', context)['url']
+target = context.getActionInfo('object/edit')['url']
 buttons.append( {'name': 'change', 'value': 'Change'} )
 buttons.append( {'name': 'change_and_view', 'value': 'Change and View'} )
 control['form'] = { 'action': target,


=== CMF/CMFDefault/skins/zpt_content/newsitem_edit_control.py 1.1 => 1.2 ===
--- CMF/CMFDefault/skins/zpt_content/newsitem_edit_control.py:1.1	Tue Jan 20 17:30:52 2004
+++ CMF/CMFDefault/skins/zpt_content/newsitem_edit_control.py	Thu Feb  5 09:45:37 2004
@@ -37,8 +37,7 @@
             message = 'News Item changed.'
 
     if ok and change_and_view:
-        ti = context.getTypeInfo()
-        target = ti.getActionInfo('object/view', context)['url']
+        target = context.getActionInfo('object/view')['url']
         query = make_query(portal_status_message=message)
         context.REQUEST.RESPONSE.redirect( '%s?%s' % (target, query) )
         return None
@@ -50,8 +49,7 @@
 control = {}
 
 buttons = []
-ti = context.getTypeInfo()
-target = ti.getActionInfo('object/edit', context)['url']
+target = context.getActionInfo('object/edit')['url']
 buttons.append( {'name': 'change', 'value': 'Change'} )
 buttons.append( {'name': 'change_and_view', 'value': 'Change and View'} )
 control['form'] = { 'action': target,