summaryrefslogtreecommitdiff
path: root/ishtar_common/migrations
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-10-23 12:36:44 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-04-16 16:38:32 +0200
commit94a4a57148d2c81dbbc1251b7e79ba09282af217 (patch)
treee37714d36079e8af4d8e972d16859c6bc338b406 /ishtar_common/migrations
parent406252c203e6863aa4ae02619037f13439706f98 (diff)
downloadIshtar-94a4a57148d2c81dbbc1251b7e79ba09282af217.tar.bz2
Ishtar-94a4a57148d2c81dbbc1251b7e79ba09282af217.zip
✨ imports: allow errors to be pointed out line by line
Diffstat (limited to 'ishtar_common/migrations')
-rw-r--r--ishtar_common/migrations/0230_auto_20231024_1045.py (renamed from ishtar_common/migrations/0230_auto_20231018_1551.py)17
-rw-r--r--ishtar_common/migrations/0231_default_mandatory_keys.py2
2 files changed, 17 insertions, 2 deletions
diff --git a/ishtar_common/migrations/0230_auto_20231018_1551.py b/ishtar_common/migrations/0230_auto_20231024_1045.py
index c2fc2abe0..f9715bd65 100644
--- a/ishtar_common/migrations/0230_auto_20231018_1551.py
+++ b/ishtar_common/migrations/0230_auto_20231024_1045.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-10-18 15:51
+# Generated by Django 2.2.24 on 2023-10-24 10:45
import django.core.validators
from django.db import migrations, models
@@ -153,6 +153,21 @@ class Migration(migrations.Migration):
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='imports', to='ishtar_common.ImportGroup', verbose_name='Group'),
),
migrations.CreateModel(
+ name='ImportLineError',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('line', models.PositiveIntegerField(verbose_name='Line')),
+ ('ignored', models.BooleanField(default=False, verbose_name='Ignored')),
+ ('import_item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='error_lines', to='ishtar_common.Import')),
+ ],
+ options={
+ 'verbose_name': 'Import - Ignored error',
+ 'verbose_name_plural': 'Import - Ignored error',
+ 'ordering': ('import_item', 'line'),
+ 'unique_together': {('line', 'import_item')},
+ },
+ ),
+ migrations.CreateModel(
name='ImporterGroupImporter',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
diff --git a/ishtar_common/migrations/0231_default_mandatory_keys.py b/ishtar_common/migrations/0231_default_mandatory_keys.py
index 568e60b9a..cd245322a 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_20231018_1551'),
+ ('ishtar_common', '0230_auto_20231024_1045'),
]
operations = [