diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-10-05 17:00:12 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-04-16 16:38:32 +0200 |
| commit | aa2abd6df37846e4735d7b7d3bdea2fdd4ba9928 (patch) | |
| tree | e1d8678c70ea58db4aa3e1f808d705fa9fe75f87 /ishtar_common | |
| parent | b75d3163bed945b58e643982820883e72e4b8dc4 (diff) | |
| download | Ishtar-aa2abd6df37846e4735d7b7d3bdea2fdd4ba9928.tar.bz2 Ishtar-aa2abd6df37846e4735d7b7d3bdea2fdd4ba9928.zip | |
🗃️ imports: add ignore_errors field
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/migrations/0230_auto_20231005_1650.py (renamed from ishtar_common/migrations/0230_auto_20231002_1613.py) | 9 | ||||
| -rw-r--r-- | ishtar_common/migrations/0231_default_mandatory_keys.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ishtar_common/migrations/0230_auto_20231002_1613.py b/ishtar_common/migrations/0230_auto_20231005_1650.py index ec409c5e2..9eb1f478a 100644 --- a/ishtar_common/migrations/0230_auto_20231002_1613.py +++ b/ishtar_common/migrations/0230_auto_20231005_1650.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2023-10-02 16:13 +# Generated by Django 2.2.24 on 2023-10-05 16:50 import django.core.validators from django.db import migrations, models @@ -64,6 +64,11 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='importertype', + name='ignore_errors', + field=models.TextField(blank=True, help_text='If an error is encountered with the following character strings, the error is not reported in the error file. Each message is separated with a line break.', null=True, verbose_name='Error messages to ignore'), + ), + migrations.AddField( + model_name='importertype', name='is_import', field=models.BooleanField(default=True, verbose_name='Can be import'), ), @@ -135,7 +140,7 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Import - Groups', 'permissions': (('view_own_importgroup', 'Can view own Import Group'), ('add_own_importgroup', 'Can add own Import Group'), ('change_own_importgroup', 'Can change own Import Group'), ('delete_own_importgroup', 'Can delete own Import Group')), }, - bases=(models.Model, ishtar_common.utils.OwnPerms), + bases=(models.Model, ishtar_common.utils.OwnPerms, ishtar_common.utils.SheetItem), ), migrations.AddField( model_name='import', diff --git a/ishtar_common/migrations/0231_default_mandatory_keys.py b/ishtar_common/migrations/0231_default_mandatory_keys.py index b510976fb..59624d00b 100644 --- a/ishtar_common/migrations/0231_default_mandatory_keys.py +++ b/ishtar_common/migrations/0231_default_mandatory_keys.py @@ -30,7 +30,7 @@ def migrate(apps, __): class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0230_auto_20231002_1613'), + ('ishtar_common', '0230_auto_20231005_1650'), ] operations = [ diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 1723fc5bf..6c60051fc 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -202,6 +202,12 @@ class ImporterType(models.Model): pre_import_message = models.TextField( _("Pre-import form message"), blank=True, default="", max_length=500 ) + ignore_errors = models.TextField( + verbose_name=_("Error messages to ignore"), blank=True, null=True, + help_text=_("If an error is encountered with the following character strings, the error is not reported in " + "the error file. Each message is separated with a line break.") + ) + objects = SlugModelManager() SERIALIZATION_EXCLUDE = ["users"] |