diff options
| author | Cefin <kevon@tuta.io> | 2021-10-14 10:07:40 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-10-25 12:06:03 +0200 |
| commit | 39f4c9e25af82be0d0fcff7293d5682e9ecb8530 (patch) | |
| tree | 3f74c3f26dd4dbddd9f2f9ceb3b2fe9e2787e631 | |
| parent | b525f6929dc16aab3c4dd277139c34835b465659 (diff) | |
| download | Ishtar-39f4c9e25af82be0d0fcff7293d5682e9ecb8530.tar.bz2 Ishtar-39f4c9e25af82be0d0fcff7293d5682e9ecb8530.zip | |
adding formater_type_lbl on importer column
| -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): |