🐛 Context record relations import: fix missing attachment to imports (refs #5923)

9 files changed, 341 insertions, 3 deletions

diff --git a/archaeological_context_records/migrations/0116_recordrelations_import_relationship.py b/archaeological_context_records/migrations/0116_recordrelations_import_relationship.py
new file mode 100644
index 000000000..89fc8b753
--- /dev/null
+++ b/archaeological_context_records/migrations/0116_recordrelations_import_relationship.py
@@ -0,0 +1,49 @@
+# Generated by Django 2.2.24 on 2024-04-26 15:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0245_verbose_names'),
+        ('archaeological_context_records', '0115_auto_20240213_1708'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recordrelations',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_context_records_recordrelations', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AddField(
+            model_name='recordrelations',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_context_records_recordrelations', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AddField(
+            model_name='recordrelations',
+            name='timestamp_geo',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Timestamp geo'),
+        ),
+        migrations.AddField(
+            model_name='recordrelations',
+            name='timestamp_label',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Timestamp label'),
+        ),
+        migrations.AlterField(
+            model_name='contextrecord',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_context_records_contextrecord', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='contextrecord',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_context_records_contextrecord', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='dating',
+            name='precise_dating',
+            field=models.TextField(blank=True, default='', verbose_name='Precise on this dating'),
+        ),
+    ]
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 0c63ed8e9..3c733413b 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -1277,7 +1277,7 @@ class RecordRelationsManager(models.Manager):
         )
 
 
-class RecordRelations(GeneralRecordRelations, models.Model):
+class RecordRelations(GeneralRecordRelations):
     MAIN_ATTR = "left_record"
     left_record = models.ForeignKey(
         ContextRecord, related_name="right_relations", on_delete=models.CASCADE
diff --git a/archaeological_files/migrations/0115_verbose_names.py b/archaeological_files/migrations/0115_verbose_names.py
new file mode 100644
index 000000000..bf3eec6dc
--- /dev/null
+++ b/archaeological_files/migrations/0115_verbose_names.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.24 on 2024-04-26 15:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_files', '0114_main_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='file',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_files_file', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_files_file', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+    ]
diff --git a/archaeological_finds/migrations/0124_verbose_names.py b/archaeological_finds/migrations/0124_verbose_names.py
new file mode 100644
index 000000000..64e6109bc
--- /dev/null
+++ b/archaeological_finds/migrations/0124_verbose_names.py
@@ -0,0 +1,83 @@
+# Generated by Django 2.2.24 on 2024-04-26 15:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0123_remove_old_conservatory_state'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='basefind',
+            name='comment',
+            field=models.TextField(blank=True, default='', verbose_name='Comment on the circumstances of discovery'),
+        ),
+        migrations.AlterField(
+            model_name='basefind',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_finds_basefind', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='basefind',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_basefind', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='find',
+            name='comment',
+            field=models.TextField(blank=True, default='', verbose_name='General comment'),
+        ),
+        migrations.AlterField(
+            model_name='find',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_finds_find', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='find',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_find', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='historicalbasefind',
+            name='comment',
+            field=models.TextField(blank=True, default='', verbose_name='Comment on the circumstances of discovery'),
+        ),
+        migrations.AlterField(
+            model_name='historicalfind',
+            name='comment',
+            field=models.TextField(blank=True, default='', verbose_name='General comment'),
+        ),
+        migrations.AlterField(
+            model_name='property',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_finds_property', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='property',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_property', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='treatment',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_finds_treatment', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='treatment',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_treatment', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='treatmentfile',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_finds_treatmentfile', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='treatmentfile',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_finds_treatmentfile', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+    ]
diff --git a/archaeological_operations/migrations/0115_recordrelations_import_relationship.py b/archaeological_operations/migrations/0115_recordrelations_import_relationship.py
new file mode 100644
index 000000000..27cd19f51
--- /dev/null
+++ b/archaeological_operations/migrations/0115_recordrelations_import_relationship.py
@@ -0,0 +1,114 @@
+# Generated by Django 2.2.24 on 2024-04-26 15:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0245_verbose_names'),
+        ('archaeological_operations', '0114_auto_20231115_1616'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recordrelations',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_operations_recordrelations', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AddField(
+            model_name='recordrelations',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_recordrelations', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AddField(
+            model_name='recordrelations',
+            name='timestamp_geo',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Timestamp geo'),
+        ),
+        migrations.AddField(
+            model_name='recordrelations',
+            name='timestamp_label',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Timestamp label'),
+        ),
+        migrations.AlterField(
+            model_name='administrativeact',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_operations_administrativeact', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='administrativeact',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_administrativeact', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='archaeologicalsite',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_operations_archaeologicalsite', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='archaeologicalsite',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_archaeologicalsite', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='historicaloperation',
+            name='documentation_received',
+            field=models.NullBooleanField(verbose_name='Documentation provided'),
+        ),
+        migrations.AlterField(
+            model_name='historicaloperation',
+            name='finds_received',
+            field=models.NullBooleanField(verbose_name='Finds provided'),
+        ),
+        migrations.AlterField(
+            model_name='historicaloperation',
+            name='operation_code',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Yearly index'),
+        ),
+        migrations.AlterField(
+            model_name='operation',
+            name='documentation_received',
+            field=models.NullBooleanField(verbose_name='Documentation provided'),
+        ),
+        migrations.AlterField(
+            model_name='operation',
+            name='finds_received',
+            field=models.NullBooleanField(verbose_name='Finds provided'),
+        ),
+        migrations.AlterField(
+            model_name='operation',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_operations_operation', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='operation',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_operation', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='operation',
+            name='operation_code',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Yearly index'),
+        ),
+        migrations.AlterField(
+            model_name='parcel',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_operations_parcel', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='parcel',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_parcel', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='parcelowner',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_operations_parcelowner', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='parcelowner',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_operations_parcelowner', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+    ]
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 8fbba74be..cc5c53b45 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -2377,7 +2377,7 @@ class OperationRecordRelationManager(models.Manager):
         )
 
 
-class RecordRelations(GeneralRecordRelations, models.Model):
+class RecordRelations(GeneralRecordRelations):
     MAIN_ATTR = "left_record"
     left_record = models.ForeignKey(
         Operation, related_name="right_relations", on_delete=models.CASCADE
diff --git a/archaeological_warehouse/migrations/0122_verbose_names.py b/archaeological_warehouse/migrations/0122_verbose_names.py
new file mode 100644
index 000000000..927fd6d3d
--- /dev/null
+++ b/archaeological_warehouse/migrations/0122_verbose_names.py
@@ -0,0 +1,43 @@
+# Generated by Django 2.2.24 on 2024-04-26 15:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_warehouse', '0121_auto_20240110_1511'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='container',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_warehouse_container', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='container',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_warehouse_container', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+        migrations.AlterField(
+            model_name='container',
+            name='index',
+            field=models.IntegerField(blank=True, db_index=True, null=True, verbose_name='Index'),
+        ),
+        migrations.AlterField(
+            model_name='historicalcontainer',
+            name='index',
+            field=models.IntegerField(blank=True, db_index=True, null=True, verbose_name='Index'),
+        ),
+        migrations.AlterField(
+            model_name='warehouse',
+            name='imports',
+            field=models.ManyToManyField(blank=True, related_name='imported_archaeological_warehouse_warehouse', to='ishtar_common.Import', verbose_name='Created by imports'),
+        ),
+        migrations.AlterField(
+            model_name='warehouse',
+            name='imports_updated',
+            field=models.ManyToManyField(blank=True, related_name='import_updated_archaeological_warehouse_warehouse', to='ishtar_common.Import', verbose_name='Updated by imports'),
+        ),
+    ]
diff --git a/ishtar_common/migrations/0245_verbose_names.py b/ishtar_common/migrations/0245_verbose_names.py
new file mode 100644
index 000000000..526a20fa7
--- /dev/null
+++ b/ishtar_common/migrations/0245_verbose_names.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.24 on 2024-04-26 15:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0244_imports_media_link'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='import',
+            name='imported_media_link',
+            field=models.URLField(blank=True, null=True, verbose_name='Associated media (web link to a zip file or a path)'),
+        ),
+        migrations.AlterField(
+            model_name='importgroup',
+            name='imported_media_link',
+            field=models.URLField(blank=True, null=True, verbose_name='Associated media (web link to a zip file or a path)'),
+        ),
+    ]
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index e40c7c54c..5fb370362 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -841,7 +841,10 @@ class GeneralRelationType(GeneralType):
         return obj
 
 
-class GeneralRecordRelations(object):
+class GeneralRecordRelations(Imported):
+    class Meta:
+        abstract = True
+
     @classmethod
     def general_types(cls):
         return ["relation_type"]