[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - adding a better solution and test for setChainForPortalTypes

[Jens Vagelpohl]

Log message for revision 91158:
  - adding a better solution and test for setChainForPortalTypes
    (https://bugs.launchpad.net/zope-cmf/+bug/161702)
  

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/WorkflowTool.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_WorkflowTool.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/WorkflowTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/WorkflowTool.py	2008-09-15 09:13:56 UTC (rev 91157)
+++ Products.CMFCore/trunk/Products/CMFCore/WorkflowTool.py	2008-09-15 09:24:16 UTC (rev 91158)
@@ -382,18 +382,18 @@
         if cbt is None:
             self._chains_by_type = cbt = PersistentMapping()
 
+        if isinstance(chain, basestring):
+            if chain == '(Default)':
+                chain = None
+            else:
+                chain = [ wf.strip() for wf in chain.split(',') if wf.strip() ]
+
         if chain is None:
             for type_id in pt_names:
                 if cbt.has_key(type_id):
                     del cbt[type_id]
             return
 
-        if isinstance(chain, basestring):
-            if chain == '(Default)':
-                chain = self.getDefaultChain()
-            else:
-                chain = [ wf.strip() for wf in chain.split(',') if wf.strip() ]
-
         ti_ids = [ t.getId() for t in self._listTypeInfo() ]
 
         for type_id in pt_names:

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_WorkflowTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_WorkflowTool.py	2008-09-15 09:13:56 UTC (rev 91157)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_WorkflowTool.py	2008-09-15 09:24:16 UTC (rev 91158)
@@ -301,6 +301,8 @@
         # https://bugs.launchpad.net/zope-cmf/+bug/161702
         tool.setChainForPortalTypes( ('Dummy Content',), '(Default)' )
         self.assertEquals( tool.getDefaultChain(), tool.getChainFor( dummy ) )
+        tool.setDefaultChain('a, b')
+        self.assertEquals( tool.getDefaultChain(), tool.getChainFor( dummy ) )
 
     def test_getCatalogVariablesFor( self ):