[Erp5-report] r15975 - /erp5/trunk/products/ERP5Type/Base.py

[nobody at svn.erp5.org]

Author: jp
Date: Fri Aug 31 13:31:09 2007
New Revision: 15975

URL: http://svn.erp5.org?rev=15975&view=rev
Log:
Only transitions in valid_transition_item_list should be considered.

Modified:
    erp5/trunk/products/ERP5Type/Base.py

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=15975&r1=15974&r2=15975&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Fri Aug 31 13:31:09 2007
@@ -175,14 +175,14 @@
     #LOG('valid_transition_item_list %s' % self._id, 0, str(valid_transition_item_list))
 
     # Call whatever must be called before changing states
-    for wf_id, transition_list in candidate_transition_item_list:
+    for wf_id, transition_list in valid_transition_item_list:
        wf[wf_id].notifyBefore(instance, self._id, args=args, kw=kw, transition_list=transition_list)
 
     # Compute expected result
     result = apply(self.__dict__['_m'], (instance,) + args, kw)
 
     # Change the state of statefull workflows
-    for wf_id, transition_list in candidate_transition_item_list:
+    for wf_id, transition_list in valid_transition_item_list:
       try:
         wf[wf_id].notifyWorkflowMethod(instance, self._id, args=args, kw=kw, transition_list=transition_list)
       except ObjectDeleted:
@@ -196,7 +196,7 @@
           instance.reindexObject()
 
     # Call whatever must be called after changing states
-    for wf_id, transition_list in candidate_transition_item_list:
+    for wf_id, transition_list in valid_transition_item_list:
       wf[wf_id].notifySuccess(instance, self._id, result, args=args, kw=kw, transition_list=transition_list)
 
     # Return result finally