diff options
| author | Cefin <kevon@tuta.io> | 2021-10-13 17:00:16 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-10-25 12:06:03 +0200 |
| commit | b525f6929dc16aab3c4dd277139c34835b465659 (patch) | |
| tree | 59921610daf06da202fc467cf3be23684254946c | |
| parent | e3f3e30aeca758604892176de1e67e5e0efb316d (diff) | |
| download | Ishtar-b525f6929dc16aab3c4dd277139c34835b465659.tar.bz2 Ishtar-b525f6929dc16aab3c4dd277139c34835b465659.zip | |
adding formater_type on ImportColumAdmin draft
| -rw-r--r-- | ishtar_common/admin.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 8a5f76818..f447f277e 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -1540,7 +1540,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 e67f02083..ac0295a90 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -440,6 +440,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: @@ -465,6 +466,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): |