summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-09-22 14:49:22 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-04-16 16:38:32 +0200
commitfaf34feb2bcebd3fe4fa14f21aa65b49f76c886d (patch)
treef44b5a10ef5e541e2cb7cb857e8bfae1d782b8c6 /ishtar_common
parent59224740abd34329a4aba6f84b0f715a977718d3 (diff)
downloadIshtar-faf34feb2bcebd3fe4fa14f21aa65b49f76c886d.tar.bz2
Ishtar-faf34feb2bcebd3fe4fa14f21aa65b49f76c886d.zip
🗃️ add updated relation between imports and main items
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/data_importer.py7
-rw-r--r--ishtar_common/migrations/0230_auto_20230922_1443.py (renamed from ishtar_common/migrations/0230_auto_20230920_1417.py)27
-rw-r--r--ishtar_common/migrations/0231_default_mandatory_keys.py2
-rw-r--r--ishtar_common/models_common.py3
4 files changed, 35 insertions, 4 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 45aea5c13..c4805eed6 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1216,8 +1216,11 @@ class Importer(object):
if self.import_instance:
self.import_instance.add_imported_line(self.idx_line)
- if self.import_instance and hasattr(obj, "imports") and created:
- obj.imports.add(self.import_instance)
+ if self.import_instance:
+ if created:
+ obj.imports.add(self.import_instance)
+ else:
+ obj.imports_updated.add(self.import_instance)
if created:
self.number_created += 1
diff --git a/ishtar_common/migrations/0230_auto_20230920_1417.py b/ishtar_common/migrations/0230_auto_20230922_1443.py
index e7a22d119..7839e0cd0 100644
--- a/ishtar_common/migrations/0230_auto_20230920_1417.py
+++ b/ishtar_common/migrations/0230_auto_20230922_1443.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2023-09-20 14:17
+# Generated by Django 2.2.24 on 2023-09-22 14:43
import django.core.validators
from django.db import migrations, models
@@ -36,6 +36,16 @@ class Migration(migrations.Migration):
options={'verbose_name': 'Import - Item key', 'verbose_name_plural': 'Import - Item keys'},
),
migrations.AddField(
+ model_name='document',
+ name='imports_updated',
+ field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_document', to='ishtar_common.Import'),
+ ),
+ migrations.AddField(
+ model_name='geovectordata',
+ name='imports_updated',
+ field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_geovectordata', to='ishtar_common.Import'),
+ ),
+ migrations.AddField(
model_name='import',
name='next_import',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='imports', to='ishtar_common.Import', verbose_name='Next import'),
@@ -65,6 +75,21 @@ class Migration(migrations.Migration):
name='tab_number',
field=models.PositiveIntegerField(default=1, help_text='When using an Excel or Calc file choose the tab number. Keep it to 1 by default.', validators=[django.core.validators.MinValueValidator(1)], verbose_name='Tab number'),
),
+ migrations.AddField(
+ model_name='organization',
+ name='imports_updated',
+ field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_organization', to='ishtar_common.Import'),
+ ),
+ migrations.AddField(
+ model_name='person',
+ name='imports_updated',
+ field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_person', to='ishtar_common.Import'),
+ ),
+ migrations.AddField(
+ model_name='town',
+ name='imports_updated',
+ field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_town', to='ishtar_common.Import'),
+ ),
migrations.AlterField(
model_name='import',
name='imported_images',
diff --git a/ishtar_common/migrations/0231_default_mandatory_keys.py b/ishtar_common/migrations/0231_default_mandatory_keys.py
index f93891e56..d364f01dc 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_20230920_1417'),
+ ('ishtar_common', '0230_auto_20230922_1443'),
]
operations = [
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index ccc70d81c..aa6a329c3 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -1098,6 +1098,9 @@ class Imported(models.Model):
)
timestamp_geo = models.IntegerField(_("Timestamp geo"), null=True, blank=True)
timestamp_label = models.IntegerField(_("Timestamp label"), null=True, blank=True)
+ imports_updated = models.ManyToManyField(
+ Import, blank=True, related_name="import_updated_%(app_label)s_%(class)s"
+ )
class Meta:
abstract = True