Worklist.py: resolve error when matched portal type list is not definded.

product/ERP5Workflow/Document/Worklist.py

@@ -135,12 +135,11 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
         self.var_matches = {}
         matches = ''
         if id == 'portal_type':
-          v = ''.join(self.getMatchedPortalTypeList())
-          LOG('3.1 Matched Portal type = %s'%v, WARNING, 'in Worklist.py')
+          v = ''.join(self.matched_portal_type)
           if tales_re.match(v).group(1):
             matches = Expression(v)
           else:
-            v = [ var.strip() for var in self.getMatchedPortalTypeList() ]
+            v = [ var.strip() for var in self.matched_portal_type ]
             matches = tuple(v)
         elif id == 'validation_state':
           matches_id_list = self.getMatchedValidationStateList()
@@ -148,14 +147,14 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
           for state_id in matches_id_list:
             matches_ref_list.append(self.getParent()._getOb(state_id).getReference())
           matches = tuple(matches_ref_list)
-        elif id == 'simulation_stae':
+        elif id == 'simulation_state':
           matches_id_list = self.getMatchedSimulationStateList()
           matches_ref_list = []
           for state_id in matches_id_list:
             matches_ref_list.append(self.getParent()._getOb(state_id).getReference())
           matches = tuple(matches_ref_list)
         else:
-          raise NotImplementedError ("Cataloged variable matching error in Worklist.py")
+          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.