diff options
| author | Cefin <kevon@tuta.io> | 2021-10-14 10:07:40 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-11-16 17:04:41 +0100 |
| commit | 56cc6d66f640e1a9da9781f5eb91846593edae8c (patch) | |
| tree | 4a689e7a21f4b78ed1f961d346274cc8e28bdca1 /ishtar_common | |
| parent | 79d05c9a860869e0aa70fe9c99c4fdfbeaebf5d6 (diff) | |
| download | Ishtar-56cc6d66f640e1a9da9781f5eb91846593edae8c.tar.bz2 Ishtar-56cc6d66f640e1a9da9781f5eb91846593edae8c.zip | |
adding formater_type_lbl on importer column
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/admin.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index f447f277e..d717e008a 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -1537,10 +1537,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 ac0295a90..0f60d8fa2 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -440,7 +440,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: @@ -467,7 +466,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): |