[Erp5-report] r44064 nicolas - /erp5/trunk/products/ERP5Type/patches/DCWorkflow.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Mar  9 09:59:33 2011
New Revision: 44064

URL: http://svn.erp5.org?rev=44064&view=rev
Log:
- get rid of getToolByName
- access tools from portal itself


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

Modified: erp5/trunk/products/ERP5Type/patches/DCWorkflow.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/DCWorkflow.py?rev=44064&r1=44063&r2=44064&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/DCWorkflow.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/DCWorkflow.py [utf8] Wed Mar  9 09:59:33 2011
@@ -127,10 +127,10 @@ def DCWorkflowDefinition_listGlobalActio
       return None
 
     def _listGlobalActions(user=None, id=None, portal_path=None):
-      portal_url = getToolByName(self, 'portal_url')
+      portal = self._getPortalRoot()
+      portal_url = portal.portal_url
       portal_url = portal_url()
       sm = getSecurityManager()
-      portal = self._getPortalRoot()
       res = []
       fmt_data = None
       # We want to display some actions depending on the current date
@@ -216,8 +216,9 @@ def DCWorkflowDefinition_getWorklistVari
   if not self.worklists:
     return None
 
+  portal = self.getPortalObject()
   def getPortalTypeListForWorkflow(workflow_id):
-      workflow_tool = getToolByName(self, 'portal_workflow')
+      workflow_tool = portal.portal_workflow
       result = []
       append = result.append
       for type_info in workflow_tool._listTypeInfo():
@@ -233,7 +234,7 @@ def DCWorkflowDefinition_getWorklistVari
     return None
   variable_match_dict = {}
   security_manager = getSecurityManager()
-  portal = self.getPortalObject()
+  workflow_tool = portal.portal_workflow
   workflow_id = self.id
   workflow_title = self.title
   for worklist_id, worklist_definition in self.worklists.items():