summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar_common/admin.py2
-rw-r--r--ishtar_common/models_imports.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index f7787ad7b..ce27563f4 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -1544,10 +1544,10 @@ class ImporterColumnAdmin(admin.ModelAdmin):
"col_number",
"col_string",
"description",
+ "formater_type_lbl",
"targets_lbl",
"duplicate_fields_lbl",
"required",
- "formater_type",
)
list_filter = ("importer_type",)
inlines = (ImportTargetInline, ImporterDuplicateFieldInline)
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 102177fae..8f273d75c 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -442,7 +442,6 @@ 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:
@@ -469,7 +468,7 @@ class ImporterColumn(models.Model):
for dp in self.duplicate_fields.all()])
def formater_type_lbl(self):
- return ', '.join([target.formater_type for formater_type in self.targets.all()])
+ return ', '.join([str(target.formater_type) for target in self.targets.all()])
class ImporterDuplicateFieldManager(models.Manager):