Worklist.py: when the key is causality in getVarMatch, return the causality state id directly.

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 ()