Commit 5a45b0e1 authored by Vincent Pelletier's avatar Vincent Pelletier

CMFActivity.Activity.SQLBase: Expect group_method_id to always be a string.

group_method_id column is declared "NOT NULL", so it can only be None if
getProcessableMessageList could not find any activity, in which case this
code is not executed ("if message_list" is false).
This simplifies two "if" statements.
parent 295a32ea
...@@ -624,10 +624,9 @@ CREATE TABLE %s ( ...@@ -624,10 +624,9 @@ CREATE TABLE %s (
node_family_id_list) node_family_id_list)
if message_list: if message_list:
# Remove group_id parameter from group_method_id # Remove group_id parameter from group_method_id
if group_method_id is not None: group_method_id = group_method_id.split('\0')[0]
group_method_id = group_method_id.split('\0')[0] if group_method_id != "":
if group_method_id not in (None, ""): method = activity_tool.invokeGroup
method = activity_tool.invokeGroup
args = (group_method_id, message_list, self.__class__.__name__, args = (group_method_id, message_list, self.__class__.__name__,
hasattr(self, 'generateMessageUID')) hasattr(self, 'generateMessageUID'))
activity_runtime_environment = ActivityRuntimeEnvironment(None) activity_runtime_environment = ActivityRuntimeEnvironment(None)
......
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