[CMF-checkins] CVS: CMF/CMFCore - ActionInformation.py:1.15.4.1

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv21488/CMFCore

Modified Files:
      Tag: yuppie-collector152-branch
	ActionInformation.py 
Log Message:
this should do the right thing with oldstyle content type actions

=== CMF/CMFCore/ActionInformation.py 1.15 => 1.15.4.1 ===
--- CMF/CMFCore/ActionInformation.py:1.15	Wed Apr 23 12:51:57 2003
+++ CMF/CMFCore/ActionInformation.py	Thu May  8 15:01:04 2003
@@ -133,7 +133,7 @@
         expr = action and action.text or ''
         if expr and type( expr ) is StringType:
             if not expr.startswith('python:') and not expr.startswith('string:'):
-                expr = 'string:%s' % expr
+                expr = 'string:${object_url}/%s' % expr
                 self.action = Expression( expr )
         return expr
 
@@ -141,7 +141,7 @@
     def setActionExpression(self, action):
         if action and type( action ) is StringType:
             if not action.startswith('python:')  and not action.startswith('string:'):
-                action = 'string:%s' % action
+                action = 'string:${object_url}/%s' % action
                 action = Expression( action )
         self.action = action