[Erp5-report] r24892 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Dec 15 10:52:47 2008
New Revision: 24892

URL: http://svn.erp5.org?rev=24892&view=rev
Log:
2008-12-15 Kazuhiko
* fix a bug in r24863 that uses a conflict variable name with a passed argument.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml?rev=24892&r1=24891&r2=24892&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistoryItemList.xml [utf8] Mon Dec 15 10:52:47 2008
@@ -62,19 +62,19 @@
 i = 1\n
 portal_object = context.getPortalObject()\n
 portal_workflow = portal_object.portal_workflow\n
-workflow_id_list = [workflow_id for workflow_id, workflow_state in context.getWorkflowStateItemList()]\n
+workflow_id_list = [x for x, y in context.getWorkflowStateItemList()]\n
 if not workflow_id in workflow_id_list:\n
   return []\n
 # Get history\n
 # XXX Compatibility\n
 for history_name in [\'history\', \'building_history\', \'installation_history\']:\n
-  workflow_item_list = context.portal_workflow.getInfoFor(ob=context, \n
+  workflow_item_list = portal_workflow.getInfoFor(ob=context, \n
                                           name=\'history\', wf_id=workflow_id)\n
   if workflow_item_list != []:\n
     break\n
 \n
-wf_states = context.portal_workflow[workflow_id].states\n
-wf_transitions = context.portal_workflow[workflow_id].transitions\n
+wf_states = portal_workflow[workflow_id].states\n
+wf_transitions = portal_workflow[workflow_id].transitions\n
 \n
 next_serial = None\n
 previous_obj = None\n
@@ -194,7 +194,8 @@
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
-                            <string>workflow_state</string>
+                            <string>x</string>
+                            <string>y</string>
                             <string>workflow_id_list</string>
                             <string>history_name</string>
                             <string>workflow_item_list</string>
@@ -213,7 +214,6 @@
                             <string>compatibility_name</string>
                             <string>len</string>
                             <string>same_type</string>
-                            <string>x</string>
                             <string>getattr</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=24892&r1=24891&r2=24892&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Mon Dec 15 10:52:47 2008
@@ -1,1 +1,1 @@
-1037
+1038