Fixed conditional field mapping usage in mapping chains

2018-10-16 13:57:51 +02:00
parent a61b3d352a
commit 265ce115a0
1 changed files with 3 additions and 3 deletions
@@ -165,14 +165,14 @@ class FieldMappingChain(object):

        for fieldname in current_fieldmappings:
            mapping = config.get_fieldmapping(fieldname)
-            if type(mapping) in (SimpleFieldMapping, ConditionalFieldMapping):
+            if type(mapping) in (SimpleFieldMapping,  MultiFieldMapping):
                resolved_mapping = mapping.resolve_fieldname(fieldname)
                if type(resolved_mapping) is list:
                    fieldmappings.update(resolved_mapping)
                else:
                    fieldmappings.add(resolved_mapping)
-            elif type(mapping) == MultiFieldMapping:
-                fieldmappings.update(mapping.resolve_fieldname(fieldname))
+            elif type(mapping) == ConditionalFieldMapping:
+                fieldmappings.add(mapping)
            else:
                raise TypeError("Type '{}' is not supported by FieldMappingChain".format(str(type(mapping))))