fixed bug in process

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

product/CMFActivity/Activity/RAMDict.py

@@ -93,11 +93,14 @@ class RAMDict(Queue):
   def hasActivity(self, activity_tool, object, **kw):
     if object is not None:
       object_path = object.getPhysicalPath()
+    else:
+      object_path = None     
+    active_process = kw.get('active_process', None)      
     for m in self.getDict(activity_tool).values():
-        if m.object_path == object_path:
+      # Filter active process and path if defined
+      if active_process is None or m.active_process == active_process:
+        if object_path is None or m.object_path == object_path:
           return 1
-    else:
-      return 1 # Default behaviour if no object specified is to return 1 until active_process implemented
     return 0
 
   def flush(self, activity_tool, object_path, invoke=0, method_id=None, **kw):

product/CMFActivity/Activity/RAMQueue.py

@@ -79,9 +79,15 @@ class RAMQueue(Queue):
 
 
   def hasActivity(self, activity_tool, object, **kw):
+    if object is not None:
       object_path = object.getPhysicalPath()
+    else:
+      object_path = None  
+    active_process = kw.get('active_process', None)           
     for m in self.getQueue(activity_tool):
-      if m.object_path == object_path:
+      # Filter active process and path if defined
+      if active_process is None or m.active_process == active_process:
+        if object_path is None or m.object_path == object_path:
           return 1
     return 0