[CMF-checkins] CVS: Products/DCWorkflow - Expression.py:1.13.2.1

[Jens Vagelpohl]

Update of /cvs-repository/Products/DCWorkflow
In directory cvs.zope.org:/tmp/cvs-serv5439/DCWorkflow

Modified Files:
      Tag: CMF-1_5-branch
	Expression.py 
Log Message:
- DCWorkflow: To bridge some of the bound variable name differences
  between TALES expressions used in DCWorkflow and those used elsewhere
  in the CMF, added two "aliases" to the expression context that reflect
  the CMF conventions: "object" points to "here", and "folder" points
  to "container" (http://www.zope.org/Collectors/CMF/338)


=== Products/DCWorkflow/Expression.py 1.13 => 1.13.2.1 ===
--- Products/DCWorkflow/Expression.py:1.13	Thu Aug 12 11:07:44 2004
+++ Products/DCWorkflow/Expression.py	Fri Apr 15 05:01:32 2005
@@ -98,9 +98,12 @@
     '''
     ob = sci.object
     wf = sci.workflow
+    container = aq_parent(aq_inner(ob))
     data = {
         'here':         ob,
-        'container':    aq_parent(aq_inner(ob)),
+        'object':       ob,
+        'container':    container,
+        'folder':       container,
         'nothing':      None,
         'root':         wf.getPhysicalRoot(),
         'request':      getattr( ob, 'REQUEST', None ),