DomainTool: list predicate values if more than one match

product/ERP5/Tool/DomainTool.py

@@ -291,10 +291,13 @@ class DomainTool(BaseTool):
           # Feel free to improve.
           if getMappedValuePropertyList is not None:
             for mapped_value_property in predicate.getMappedValuePropertyList():
-              if not mapped_value_property_dict.has_key(mapped_value_property):
               value = predicate.getProperty(mapped_value_property)
+              if not mapped_value_property_dict.has_key(mapped_value_property):
                 if value is not None:
-                  mapped_value_property_dict[mapped_value_property] = value
+                  mapped_value_property_dict[mapped_value_property] = [value,]
+              else:
+                if value is not None:
+                  mapped_value_property_dict[mapped_value_property].append(value)
         # Update mapped value
         mapped_value.edit(**mapped_value_property_dict)
       return mapped_value
@@ -327,12 +330,9 @@ class DomainTool(BaseTool):
           full_prop_dict = explanation_dict[
             tuple(predicate.getMembershipCriterionCategoryList())]
           for mapped_value_property in predicate.getMappedValuePropertyList():
-            if mapped_value_property in full_prop_dict:
-              # we already have one value for this (categories, property)
-              continue
             value = predicate.getProperty(mapped_value_property)
             if value is not None:
-              full_prop_dict[mapped_value_property] = value
+              full_prop_dict.setdefault(mapped_value_property, []).append(value)
               mapped_value_property_dict[mapped_value_property].append(value)
         if explanation_only:
           return dict(explanation_dict)