[Erp5-report] r29880 - /erp5/trunk/products/ERP5Type/patches/ActionsTool.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Wed Oct 21 16:20:10 2009
New Revision: 29880

URL: http://svn.erp5.org?rev=29880&view=rev
Log:
Test our API before the CMFCore API when listing actions so our tools queried with our API instead of CMFCore's (approved by jm)

Modified:
    erp5/trunk/products/ERP5Type/patches/ActionsTool.py

Modified: erp5/trunk/products/ERP5Type/patches/ActionsTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/ActionsTool.py?rev=29880&r1=29879&r2=29880&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/ActionsTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/ActionsTool.py [utf8] Wed Oct 21 16:20:10 2009
@@ -34,14 +34,14 @@
     # Include actions from specific tools.
     for provider_name in self.listActionProviders():
         provider = getattr(self, provider_name)
-        if IActionProvider_providedBy(provider):
-            actions.extend( provider.listActionInfos(object=object) )
-        elif hasattr(provider, 'getActionListFor'):
+        if hasattr(provider, 'getActionListFor'):
             from Products.ERP5Type.Utils import createExpressionContext
             ec = createExpressionContext(object)
             actions.extend(action.cook(ec)
                            for action in provider.getActionListFor(object)
                            if action.test(ec))
+        elif IActionProvider_providedBy(provider):
+            actions.extend( provider.listActionInfos(object=object) )
         else:
             # for Action Providers written for CMF versions before 1.5
             actions.extend( self._listActionInfos(provider, object) )