summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar_common/admin.py2
-rw-r--r--ishtar_common/models_imports.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 63dfc428f..f7787ad7b 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -1547,7 +1547,7 @@ class ImporterColumnAdmin(admin.ModelAdmin):
"targets_lbl",
"duplicate_fields_lbl",
"required",
- "value_format",
+ "formater_type",
)
list_filter = ("importer_type",)
inlines = (ImportTargetInline, ImporterDuplicateFieldInline)
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index c91ce473f..102177fae 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -442,6 +442,7 @@ class ImporterColumn(models.Model):
help_text=_("Fill this field if the field name is ambiguous for "
"export. For instance: concatenated fields.")
)
+ formater_type = models.ForeignKey("ImportTarget", related_name='columns')
objects = ImporterColumnManager()
class Meta:
@@ -467,6 +468,9 @@ class ImporterColumn(models.Model):
return ', '.join([dp.field_name or ""
for dp in self.duplicate_fields.all()])
+ def formater_type_lbl(self):
+ return ', '.join([target.formater_type for formater_type in self.targets.all()])
+
class ImporterDuplicateFieldManager(models.Manager):
def get_by_natural_key(self, importer_type, col_number, field_name):