Fix naming convention.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17691 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml

@@ -66,10 +66,10 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>from ZODB.POSException import ConflictError\n
-# Wrapper for zGetCountFromWorklistTable\n
+# Wrapper for Base_zGetCountFromWorklistTable\n
 where_expression = query.asSQLExpression()[\'where_expression\']\n
 try:\n
-  result = context.zGetCountFromWorklistTable(\n
+  result = context.Base_zGetCountFromWorklistTable(\n
   where_expression=where_expression,\n
   select_expression=select_expression,\n
   group_by_expression=group_by_expression,\n
@@ -80,7 +80,7 @@ except:\n
   # Possibly a SQL error caused by a non-existing table.\n
   # Attemp a refresh and retry without error handling.\n
   context.Base_refreshWorklistTableContent()\n
-  result = context.zGetCountFromWorklistTable(\n
+  result = context.Base_zGetCountFromWorklistTable(\n
   where_expression=where_expression,\n
   select_expression=select_expression,\n
   group_by_expression=group_by_expression,\n

bt5/erp5_worklist_sql/bt/revision

-5
\ No newline at end of file
+6

product/ERP5Type/patches/WorkflowTool.py

@@ -548,7 +548,7 @@ def WorkflowTool_refreshWorklistCache(self):
         worklist_dict[wf_id] = a
   # End of duplicated code
   if len(worklist_dict):
-    self.zCreateWorklistTable() # Create (or flush existing) table
+    self.Base_zCreateWorklistTable() # Create (or flush existing) table
     portal_catalog = getToolByName(self, 'portal_catalog')
     search_result = portal_catalog.unrestrictedSearchResults
     acceptable_key_dict = portal_catalog.getSQLCatalog().getColumnMap()
@@ -589,6 +589,6 @@ def WorkflowTool_refreshWorklistCache(self):
           if column_id in value_column_dict:
             value_column_dict[column_id].append(value)
       if len(value_column_dict[COUNT_COLUMN_TITLE]):
-        self.zInsertIntoWorklistTable(**value_column_dict)
+        self.Base_zInsertIntoWorklistTable(**value_column_dict)
 
 WorkflowTool.refreshWorklistCache = WorkflowTool_refreshWorklistCache