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

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Jul 25 10:52:47 2008
New Revision: 22648

URL: http://svn.erp5.org?rev=22648&view=rev
Log:
Forgot to replace 1 more validation occurence in each queue.

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=22648&r1=22647&r2=22648&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py Fri Jul 25 10:52:47 2008
@@ -540,8 +540,11 @@
           if not method_dict.has_key(m.method_id):
             method_dict[m.method_id] = 1 # Prevents calling invoke twice
             if invoke:
-              # First Validate
-              validate_value = m.validate(self, activity_tool)
+              # 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
               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=22648&r1=22647&r2=22648&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLQueue.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLQueue.py Fri Jul 25 10:52:47 2008
@@ -402,8 +402,11 @@
         method_id = line.method_id
         m = self.loadMessage(line.message, uid = line.uid)
         if invoke:
-          # First Validate
-          validate_value = m.validate(self, activity_tool)
+          # 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
           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