Commit 3b0f9c7d authored by Yoshinori Okuji's avatar Yoshinori Okuji

Add a new feature, alternate method.

This method is used to invoke a part of expanded objects separately.
When activate specifies an alternate_method_id, the Acitivty Tool
detects an alternative method automatically from a list of grouped objects.
If found, such an object is activated separately by using the alternate
method.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5746 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d9da3636
...@@ -608,6 +608,8 @@ class ActivityTool (Folder, UniqueObject): ...@@ -608,6 +608,8 @@ class ActivityTool (Folder, UniqueObject):
# Filter the list of messages. If an object is not available, ignore such a message. # Filter the list of messages. If an object is not available, ignore such a message.
# In addition, expand an object if necessary, and make sure that no duplication happens. # In addition, expand an object if necessary, and make sure that no duplication happens.
for m in message_list: for m in message_list:
# alternate method is used to segregate objects which cannot be grouped.
alternate_method_id = m.activity_kw.get('alternate_method_id')
try: try:
obj = m.getObject(self) obj = m.getObject(self)
i = len(new_message_list) # This is an index of this message in new_message_list. i = len(new_message_list) # This is an index of this message in new_message_list.
...@@ -616,11 +618,31 @@ class ActivityTool (Folder, UniqueObject): ...@@ -616,11 +618,31 @@ class ActivityTool (Folder, UniqueObject):
path = subobj.getPath() path = subobj.getPath()
if path not in path_dict: if path not in path_dict:
path_dict[path] = i path_dict[path] = i
if alternate_method_id is not None \
and hasattr(aq_base(subobj), alternate_method_id):
# if this object is alternated, generate a new single active object.
activity_kw = m.activity_kw.copy()
if 'group_method_id' in activity_kw:
del activity_kw['group_method_id']
active_obj = subobj.activate(**activity_kw)
#LOG('ActivityTool', 0, 'sub object %r has an alternate method %r, so invoking separately' % (subobj, alternate_method_id))
getattr(active_obj, alternate_method_id)(*m.args, **m.kw)
else:
expanded_object_list.append(subobj) expanded_object_list.append(subobj)
else: else:
path = obj.getPath() path = obj.getPath()
if path not in path_dict: if path not in path_dict:
path_dict[path] = i path_dict[path] = i
if alternate_method_id is not None \
and hasattr(aq_base(obj), alternate_method_id):
# if this object is alternated, generate a new single active object.
activity_kw = m.activity_kw.copy()
if 'group_method_id' in activity_kw:
del activity_kw['group_method_id']
active_obj = obj.activate(**activity_kw)
#LOG('ActivityTool', 0, 'object %r has an alternate method %r, so invoking separately' % (obj, alternate_method_id))
getattr(active_obj, alternate_method_id)(*m.args, **m.kw)
else:
expanded_object_list.append(obj) expanded_object_list.append(obj)
object_list.append(obj) object_list.append(obj)
new_message_list.append(m) new_message_list.append(m)
...@@ -659,7 +681,7 @@ class ActivityTool (Folder, UniqueObject): ...@@ -659,7 +681,7 @@ class ActivityTool (Folder, UniqueObject):
m = new_message_list[i] m = new_message_list[i]
if i in failed_message_dict: if i in failed_message_dict:
m.is_executed = 0 m.is_executed = 0
LOG('WARNING ActivityTool', 0, LOG('ActivityTool', WARNING,
'the method %s partially failed on object %s' % (m.method_id, m.object_path,)) 'the method %s partially failed on object %s' % (m.method_id, m.object_path,))
else: else:
try: try:
...@@ -668,7 +690,7 @@ class ActivityTool (Folder, UniqueObject): ...@@ -668,7 +690,7 @@ class ActivityTool (Folder, UniqueObject):
except: except:
m.is_executed = 0 m.is_executed = 0
m.exc_type = sys.exc_info()[0] m.exc_type = sys.exc_info()[0]
LOG('WARNING ActivityTool', 0, LOG('ActivityTool', WARNING,
'Could not call method %s on object %s' % (m.method_id, m.object_path), error=sys.exc_info()) 'Could not call method %s on object %s' % (m.method_id, m.object_path), error=sys.exc_info())
def newMessage(self, activity, path, active_process, activity_kw, method_id, *args, **kw): def newMessage(self, activity, path, active_process, activity_kw, method_id, *args, **kw):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment