From f428b3cc8be51702e34764e702a88ebb300da56e Mon Sep 17 00:00:00 2001 From: Wenjie Zheng <wenjie.zheng@tiolive.com> Date: Fri, 4 Sep 2015 08:32:59 +0000 Subject: [PATCH] Worklist.py: when the key is causality in getVarMatch, return the causality state id directly. --- product/ERP5Workflow/Document/Worklist.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/product/ERP5Workflow/Document/Worklist.py b/product/ERP5Workflow/Document/Worklist.py index d7e11e3d07..5deaa43f39 100644 --- a/product/ERP5Workflow/Document/Worklist.py +++ b/product/ERP5Workflow/Document/Worklist.py @@ -131,8 +131,8 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject): def getVarMatch(self, id): """ return value of matched keys""" - self.var_matches = {} - matches = '' + #self.var_matches = {} + matches = None if id == 'portal_type': v = ''.join(self.matched_portal_type) if tales_re.match(v).group(1): @@ -153,18 +153,19 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject): matches_ref_list.append(self.getParent()._getOb(state_id).getReference()) matches = tuple(matches_ref_list) elif id == 'causality_state': - matches_id_list = self.getMatchedCausalityStateList() + matches_id = self.getMatchedCausalityState() matches_ref_list = [] - for state_id in matches_id_list: - matches_ref_list.append(self.getParent()._getOb(state_id).getReference()) + matches_ref_list.append(matches_id) matches = tuple(matches_ref_list) else: raise NotImplementedError ("Cataloged variable '%s' matching error in Worklist.py"%id) if matches is not None: + """ if not isinstance(matches, (tuple, Expression)): # Old version, convert it. matches = (matches,) self.var_matches[id] = str(matches) + """ return matches else: return () -- 2.30.9