From 4d7695f65cd3e2ebb0829512e3b88dcb233fd124 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Mon, 8 Jan 2018 16:10:53 +0100 Subject: [PATCH] CMFActivity: fix dependency on empty lists e.g. `activate(after_path=())` should ignore `after_path` --- .../skins/activity/SQLBase_validateMessageList.zsql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/product/CMFActivity/skins/activity/SQLBase_validateMessageList.zsql b/product/CMFActivity/skins/activity/SQLBase_validateMessageList.zsql index e181b4b55c..5b725f0e86 100644 --- a/product/CMFActivity/skins/activity/SQLBase_validateMessageList.zsql +++ b/product/CMFActivity/skins/activity/SQLBase_validateMessageList.zsql @@ -25,18 +25,18 @@ FROM <dtml-var table> WHERE processing_node > -10 -<dtml-if expr="method_id is not None"> +<dtml-if expr="method_id"> AND method_id IN ( <dtml-in method_id><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in> ) </dtml-if> <dtml-if expr="message_uid is not None">AND uid = <dtml-sqlvar message_uid type="int"> </dtml-if> -<dtml-if expr="path is not None"> +<dtml-if expr="path"> AND path IN ( <dtml-in path><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in> ) </dtml-if> -<dtml-if expr="tag is not None"> +<dtml-if expr="tag"> AND tag IN ( <dtml-in tag><dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in> ) -- 2.30.9