summaryrefslogtreecommitdiff
path: root/ishtar_common/models_imports.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-05-15 12:18:56 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-05-15 12:18:56 +0200
commit733eae2fcfd402837bc00db4db7cbcacace6eea0 (patch)
tree8abbfa352fbdad0b90a0df609b08bec501a63527 /ishtar_common/models_imports.py
parent48422c5662e715baaabcb17ad1af05a05d687c74 (diff)
downloadIshtar-733eae2fcfd402837bc00db4db7cbcacace6eea0.tar.bz2
Ishtar-733eae2fcfd402837bc00db4db7cbcacace6eea0.zip
Data importer: manage concat of M2M (many columns)
Diffstat (limited to 'ishtar_common/models_imports.py')
-rw-r--r--ishtar_common/models_imports.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 5cb72bd18..e4d912c98 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -182,6 +182,7 @@ class ImporterType(models.Model):
continue
force_news = []
concat_str = []
+ concat = []
for target in column.targets.all():
ft = target.formater_type.get_formater_type(
target, import_instance=import_instance)
@@ -191,6 +192,7 @@ class ImporterType(models.Model):
targets.append(target.target)
concat_str.append(target.concat_str)
force_news.append(target.force_new)
+ concat.append(target.concat)
formater_kwargs = {}
if column.regexp_pre_filter:
formater_kwargs['regexp'] = re.compile(
@@ -198,6 +200,7 @@ class ImporterType(models.Model):
if column.value_format:
formater_kwargs['value_format'] = \
column.value_format.format_string
+ formater_kwargs['concat'] = concat
formater_kwargs['concat_str'] = concat_str
formater_kwargs['duplicate_fields'] = [
(field.field_name, field.force_new, field.concat,