[CMF-checkins] CVS: Products/CMFDefault - DefaultWorkflow.py:1.26

[Jens Vagelpohl]

Update of /cvs-repository/Products/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv25098/CMFDefault

Modified Files:
	DefaultWorkflow.py 
Log Message:
- CMFCore.CachingPolicyManager and CMFCore.ActionInformation: The names
  available to TALES expressions throughout the CMF showed some
  inconsistencies. To prevent confusion the names "content" and
  "content_url" that were used for Cache Policy Manager policies as well
  as the special ActionInformation.oai class are now deprecated and will
  be removed in CMF 1.7. The canonical names to be used are "object" and
  "object_url", which matches all other CMF expression contexts with
  DCWorkflow being the only exception due to its non-CMF roots.
  (http://www.zope.org/Collectors/CMF/328)


=== Products/CMFDefault/DefaultWorkflow.py 1.25 => 1.26 ===
--- Products/CMFDefault/DefaultWorkflow.py:1.25	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/DefaultWorkflow.py	Wed Mar 16 06:09:47 2005
@@ -84,7 +84,7 @@
         Allows this workflow to
         include actions to be displayed in the actions box.
         Called only when this workflow is applicable to
-        info.content.
+        info.object.
         Returns the actions to be displayed to the user.
         '''
         if info.isAnonymous:
@@ -93,8 +93,8 @@
         # The following operation is quite expensive.
         # We don't need to perform it if the user
         # doesn't have the required permission.
-        content = info.content
-        content_url = info.content_url
+        content = info.object
+        content_url = info.object_url
         content_creator = content.Creator()
         pm = getToolByName(self, 'portal_membership')
         current_user = pm.getAuthenticatedMember().getId()