[CMF-checkins] SVN: CMF/branches/2.0/ Forward-port fix for issue #308.

[Tres Seaver]

Log message for revision 68177:
  Forward-port fix for issue #308.

Changed:
  U   CMF/branches/2.0/CHANGES.txt
  U   CMF/branches/2.0/DCWorkflow/DCWorkflow.py

-=-
Modified: CMF/branches/2.0/CHANGES.txt
===================================================================
--- CMF/branches/2.0/CHANGES.txt	2006-05-18 15:55:57 UTC (rev 68176)
+++ CMF/branches/2.0/CHANGES.txt	2006-05-18 15:56:50 UTC (rev 68177)
@@ -2,6 +2,9 @@
 
   Bug Fixes
 
+    - Forward-ported fix for DCWorkflow global actions missing IDs
+      (http://www.zope.org/Collectors/CMF/308).
+
     - CMFCore Expression: Fixed 'request' provided by expression contexts.
       'request' was not set correctly if 'object' is not specified.
 

Modified: CMF/branches/2.0/DCWorkflow/DCWorkflow.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/DCWorkflow.py	2006-05-18 15:55:57 UTC (rev 68176)
+++ CMF/branches/2.0/DCWorkflow/DCWorkflow.py	2006-05-18 15:56:50 UTC (rev 68177)
@@ -242,7 +242,8 @@
                         fmt_data = TemplateDict()
                         fmt_data._push(info)
                     fmt_data._push({'count': len(searchres)})
-                    res.append((id, {'name': qdef.actbox_name % fmt_data,
+                    res.append((id, {'id': id,
+                                     'name': qdef.actbox_name % fmt_data,
                                      'url': qdef.actbox_url % fmt_data,
                                      'permissions': (),  # Predetermined.
                                      'category': qdef.actbox_category}))