[Erp5-report] r22741 - in /erp5/trunk/products/CMFActivity/Activity: SQLDict.py SQLQueue.py

[nobody at svn.erp5.org]

Author: yo
Date: Tue Jul 29 22:26:53 2008
New Revision: 22741

URL: http://svn.erp5.org?rev=22741&view=rev
Log:
I do not understand what vincent wanted to do, and his change only broke the code, so I revert it.

Modified:
    erp5/trunk/products/CMFActivity/Activity/SQLDict.py
    erp5/trunk/products/CMFActivity/Activity/SQLQueue.py

Modified: erp5/trunk/products/CMFActivity/Activity/SQLDict.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLDict.py?rev=22741&r1=22740&r2=22741&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py Tue Jul 29 22:26:53 2008
@@ -540,11 +540,8 @@
           if not method_dict.has_key(m.method_id):
             method_dict[m.method_id] = 1 # Prevents calling invoke twice
             if invoke:
-              # First Validate (only if message is marked as new)
-              if line.processing_node == -1:
-                validate_value = m.validate(self, activity_tool)
-              else:
-                validate_value = VALID
+              # First Validate
+              validate_value = m.validate(self, activity_tool)
               if validate_value is VALID:
                 activity_tool.invoke(m) # Try to invoke the message - what happens if invoke calls flushActivity ??
                 if m.is_executed != MESSAGE_EXECUTED:                                                 # Make sure message could be invoked

Modified: erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLQueue.py?rev=22741&r1=22740&r2=22741&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLQueue.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLQueue.py Tue Jul 29 22:26:53 2008
@@ -402,11 +402,8 @@
         method_id = line.method_id
         m = self.loadMessage(line.message, uid = line.uid)
         if invoke:
-          # First Validate (only if message is marked as new)
-          if line.processing_node == -1:
-            validate_value = m.validate(self, activity_tool)
-          else:
-            validate_value = VALID
+          # First Validate
+          validate_value = m.validate(self, activity_tool)
           if validate_value is VALID:
             activity_tool.invoke(m) # Try to invoke the message - what happens if invoke calls flushActivity ??
             if m.is_executed != MESSAGE_EXECUTED:                                                 # Make sure message could be invoked