From 7a445debd9237c750b6a1b7d899eb9c384edb6ab Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 30 Jan 2023 17:32:49 +0100 Subject: Add "created" field on main items in order to facilitate queries --- .../migrations/0111_auto_20230127_1503.py | 54 ------ .../migrations/0111_auto_20230130_1604.py | 65 +++++++ .../migrations/0112_migrate_created.py | 23 +++ .../migrations/0110_auto_20230127_1503.py | 24 --- .../migrations/0110_auto_20230130_1604.py | 35 ++++ .../migrations/0111_migrate_created.py | 23 +++ .../migrations/0111_auto_20230127_1504.py | 160 ---------------- .../migrations/0111_auto_20230130_1604.py | 206 +++++++++++++++++++++ .../migrations/0112_migrate_created.py | 27 +++ .../templates/ishtar/sheet_basefind.html | 12 +- .../migrations/0111_auto_20230127_1503.py | 54 ------ .../migrations/0111_auto_20230130_1604.py | 95 ++++++++++ .../migrations/0112_migrate_created.py | 27 +++ .../templates/ishtar/sheet_operation.html | 14 +- .../migrations/0116_auto_20230127_1504.py | 28 --- .../migrations/0116_auto_20230130_1605.py | 44 +++++ .../migrations/0117_migrate_created.py | 24 +++ .../migrations/0224_auto_20230127_1503.py | 68 ------- .../migrations/0224_auto_20230130_1604.py | 94 ++++++++++ ishtar_common/migrations/0225_migrate_created.py | 25 +++ ishtar_common/models_common.py | 1 + .../ishtar/blocks/sheet_creation_section.html | 4 +- ishtar_common/utils_migrations.py | 15 ++ ishtar_common/views_item.py | 2 +- ishtar_common/wizards.py | 1 + 25 files changed, 716 insertions(+), 409 deletions(-) delete mode 100644 archaeological_context_records/migrations/0111_auto_20230127_1503.py create mode 100644 archaeological_context_records/migrations/0111_auto_20230130_1604.py create mode 100644 archaeological_context_records/migrations/0112_migrate_created.py delete mode 100644 archaeological_files/migrations/0110_auto_20230127_1503.py create mode 100644 archaeological_files/migrations/0110_auto_20230130_1604.py create mode 100644 archaeological_files/migrations/0111_migrate_created.py delete mode 100644 archaeological_finds/migrations/0111_auto_20230127_1504.py create mode 100644 archaeological_finds/migrations/0111_auto_20230130_1604.py create mode 100644 archaeological_finds/migrations/0112_migrate_created.py delete mode 100644 archaeological_operations/migrations/0111_auto_20230127_1503.py create mode 100644 archaeological_operations/migrations/0111_auto_20230130_1604.py create mode 100644 archaeological_operations/migrations/0112_migrate_created.py delete mode 100644 archaeological_warehouse/migrations/0116_auto_20230127_1504.py create mode 100644 archaeological_warehouse/migrations/0116_auto_20230130_1605.py create mode 100644 archaeological_warehouse/migrations/0117_migrate_created.py delete mode 100644 ishtar_common/migrations/0224_auto_20230127_1503.py create mode 100644 ishtar_common/migrations/0224_auto_20230130_1604.py create mode 100644 ishtar_common/migrations/0225_migrate_created.py diff --git a/archaeological_context_records/migrations/0111_auto_20230127_1503.py b/archaeological_context_records/migrations/0111_auto_20230127_1503.py deleted file mode 100644 index b1d36254c..000000000 --- a/archaeological_context_records/migrations/0111_auto_20230127_1503.py +++ /dev/null @@ -1,54 +0,0 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:03 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_context_records', '0110_auto_20221017_1435'), - ] - - operations = [ - migrations.AlterField( - model_name='contextrecord', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='contextrecord', - name='excavation_technics', - field=models.ManyToManyField(blank=True, related_name='context_records', to='archaeological_context_records.ExcavationTechnicType', verbose_name='Excavation techniques'), - ), - migrations.AlterField( - model_name='contextrecord', - name='geodata', - field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_context_records_contextrecord', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), - ), - migrations.AlterField( - model_name='contextrecord', - name='main_geodata', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_context_records_contextrecord', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - migrations.AlterField( - model_name='dating', - name='period', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archaeological_operations.Period', verbose_name='Chronological period'), - ), - migrations.AlterField( - model_name='dating', - name='precise_dating', - field=models.TextField(blank=True, default='', verbose_name='Precise on dating'), - ), - migrations.AlterField( - model_name='historicalcontextrecord', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='historicalcontextrecord', - name='main_geodata', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - ] diff --git a/archaeological_context_records/migrations/0111_auto_20230130_1604.py b/archaeological_context_records/migrations/0111_auto_20230130_1604.py new file mode 100644 index 000000000..f5b6e5f50 --- /dev/null +++ b/archaeological_context_records/migrations/0111_auto_20230130_1604.py @@ -0,0 +1,65 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:04 + +import datetime +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0110_auto_20221017_1435'), + ] + + operations = [ + migrations.AddField( + model_name='contextrecord', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='contextrecord', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='contextrecord', + name='excavation_technics', + field=models.ManyToManyField(blank=True, related_name='context_records', to='archaeological_context_records.ExcavationTechnicType', verbose_name='Excavation techniques'), + ), + migrations.AlterField( + model_name='contextrecord', + name='geodata', + field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_context_records_contextrecord', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), + ), + migrations.AlterField( + model_name='contextrecord', + name='main_geodata', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_context_records_contextrecord', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + migrations.AlterField( + model_name='dating', + name='period', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archaeological_operations.Period', verbose_name='Chronological period'), + ), + migrations.AlterField( + model_name='dating', + name='precise_dating', + field=models.TextField(blank=True, default='', verbose_name='Precise on dating'), + ), + migrations.AlterField( + model_name='historicalcontextrecord', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='historicalcontextrecord', + name='main_geodata', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + ] diff --git a/archaeological_context_records/migrations/0112_migrate_created.py b/archaeological_context_records/migrations/0112_migrate_created.py new file mode 100644 index 000000000..5d3a112ad --- /dev/null +++ b/archaeological_context_records/migrations/0112_migrate_created.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2.24 on 2023-01-30 17:01 + +from django.db import migrations +from ishtar_common.utils_migrations import migrate_created_field + + +def migrate_created(apps, __): + app_name = "archaeological_context_records" + model_names = [ + "ContextRecord" + ] + migrate_created_field(apps, app_name, model_names) + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0111_auto_20230130_1604'), + ] + + operations = [ + migrations.RunPython(migrate_created) + ] diff --git a/archaeological_files/migrations/0110_auto_20230127_1503.py b/archaeological_files/migrations/0110_auto_20230127_1503.py deleted file mode 100644 index 6747a4117..000000000 --- a/archaeological_files/migrations/0110_auto_20230127_1503.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:03 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0109_auto_20220711_1024'), - ] - - operations = [ - migrations.AlterField( - model_name='equipmentservicecost', - name='price_agreement', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='equipment_service_costs', to='archaeological_files.PriceAgreement', verbose_name='Price agreement'), - ), - migrations.AlterField( - model_name='job', - name='price_agreement', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='jobs', to='archaeological_files.PriceAgreement', verbose_name='Price agreement'), - ), - ] diff --git a/archaeological_files/migrations/0110_auto_20230130_1604.py b/archaeological_files/migrations/0110_auto_20230130_1604.py new file mode 100644 index 000000000..e48e76555 --- /dev/null +++ b/archaeological_files/migrations/0110_auto_20230130_1604.py @@ -0,0 +1,35 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:04 + +import datetime +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_files', '0109_auto_20220711_1024'), + ] + + operations = [ + migrations.AddField( + model_name='file', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalfile', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='equipmentservicecost', + name='price_agreement', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='equipment_service_costs', to='archaeological_files.PriceAgreement', verbose_name='Price agreement'), + ), + migrations.AlterField( + model_name='job', + name='price_agreement', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='jobs', to='archaeological_files.PriceAgreement', verbose_name='Price agreement'), + ), + ] diff --git a/archaeological_files/migrations/0111_migrate_created.py b/archaeological_files/migrations/0111_migrate_created.py new file mode 100644 index 000000000..334f6a52f --- /dev/null +++ b/archaeological_files/migrations/0111_migrate_created.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2.24 on 2023-01-30 17:23 + +from django.db import migrations +from ishtar_common.utils_migrations import migrate_created_field + + +def migrate_created(apps, __): + app_name = "archaeological_files" + model_names = [ + "File", + ] + migrate_created_field(apps, app_name, model_names) + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_files', '0110_auto_20230130_1604'), + ] + + operations = [ + migrations.RunPython(migrate_created) + ] diff --git a/archaeological_finds/migrations/0111_auto_20230127_1504.py b/archaeological_finds/migrations/0111_auto_20230127_1504.py deleted file mode 100644 index e1d833e03..000000000 --- a/archaeological_finds/migrations/0111_auto_20230127_1504.py +++ /dev/null @@ -1,160 +0,0 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:04 - -from django.db import migrations, models -import django.db.models.deletion -import ishtar_common.utils - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_finds', '0110_auto_20220707_1633'), - ] - - operations = [ - migrations.AddField( - model_name='basefind', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AddField( - model_name='historicaltreatment', - name='complete_identifier', - field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicaltreatment', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicaltreatment', - name='qrcode', - field=models.TextField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='historicaltreatmentfile', - name='complete_identifier', - field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicaltreatmentfile', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicaltreatmentfile', - name='qrcode', - field=models.TextField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='treatment', - name='complete_identifier', - field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='treatment', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='treatment', - name='qrcode', - field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), - ), - migrations.AddField( - model_name='treatmentfile', - name='complete_identifier', - field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='treatmentfile', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='treatmentfile', - name='qrcode', - field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), - ), - migrations.AlterField( - model_name='basefind', - name='discovery_date', - field=models.DateField(blank=True, null=True, verbose_name='Discovery date (exact or beginning)'), - ), - migrations.AlterField( - model_name='basefind', - name='discovery_date_taq', - field=models.DateField(blank=True, null=True, verbose_name='Discovery date (end)'), - ), - migrations.AlterField( - model_name='basefind', - name='geodata', - field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_finds_basefind', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), - ), - migrations.AlterField( - model_name='basefind', - name='main_geodata', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_finds_basefind', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - migrations.AlterField( - model_name='find', - name='find_number', - field=models.IntegerField(blank=True, null=True, verbose_name='Number of remains'), - ), - migrations.AlterField( - model_name='find', - name='museum_id', - field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), - ), - migrations.AlterField( - model_name='historicalbasefind', - name='discovery_date', - field=models.DateField(blank=True, null=True, verbose_name='Discovery date (exact or beginning)'), - ), - migrations.AlterField( - model_name='historicalbasefind', - name='discovery_date_taq', - field=models.DateField(blank=True, null=True, verbose_name='Discovery date (end)'), - ), - migrations.AlterField( - model_name='historicalbasefind', - name='main_geodata', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - migrations.AlterField( - model_name='historicalfind', - name='find_number', - field=models.IntegerField(blank=True, null=True, verbose_name='Number of remains'), - ), - migrations.AlterField( - model_name='historicalfind', - name='museum_id', - field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), - ), - migrations.AlterField( - model_name='historicaltreatment', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='historicaltreatmentfile', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='treatment', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='treatmentfile', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - ] diff --git a/archaeological_finds/migrations/0111_auto_20230130_1604.py b/archaeological_finds/migrations/0111_auto_20230130_1604.py new file mode 100644 index 000000000..26a252c9a --- /dev/null +++ b/archaeological_finds/migrations/0111_auto_20230130_1604.py @@ -0,0 +1,206 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:04 + +import datetime +from django.db import migrations, models +import django.db.models.deletion +import ishtar_common.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0110_auto_20220707_1633'), + ] + + operations = [ + migrations.AddField( + model_name='basefind', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AddField( + model_name='basefind', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='find', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalbasefind', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalfind', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaltreatment', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicaltreatment', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaltreatment', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='historicaltreatment', + name='qrcode', + field=models.TextField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='historicaltreatmentfile', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicaltreatmentfile', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaltreatmentfile', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='historicaltreatmentfile', + name='qrcode', + field=models.TextField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='property', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='treatment', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='treatment', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='treatment', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='treatment', + name='qrcode', + field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), + ), + migrations.AddField( + model_name='treatmentfile', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='treatmentfile', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='treatmentfile', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='treatmentfile', + name='qrcode', + field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), + ), + migrations.AlterField( + model_name='basefind', + name='discovery_date', + field=models.DateField(blank=True, null=True, verbose_name='Discovery date (exact or beginning)'), + ), + migrations.AlterField( + model_name='basefind', + name='discovery_date_taq', + field=models.DateField(blank=True, null=True, verbose_name='Discovery date (end)'), + ), + migrations.AlterField( + model_name='basefind', + name='geodata', + field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_finds_basefind', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), + ), + migrations.AlterField( + model_name='basefind', + name='main_geodata', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_finds_basefind', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + migrations.AlterField( + model_name='find', + name='find_number', + field=models.IntegerField(blank=True, null=True, verbose_name='Number of remains'), + ), + migrations.AlterField( + model_name='find', + name='museum_id', + field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='discovery_date', + field=models.DateField(blank=True, null=True, verbose_name='Discovery date (exact or beginning)'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='discovery_date_taq', + field=models.DateField(blank=True, null=True, verbose_name='Discovery date (end)'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='main_geodata', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + migrations.AlterField( + model_name='historicalfind', + name='find_number', + field=models.IntegerField(blank=True, null=True, verbose_name='Number of remains'), + ), + migrations.AlterField( + model_name='historicalfind', + name='museum_id', + field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), + ), + migrations.AlterField( + model_name='historicaltreatment', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='historicaltreatmentfile', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='treatment', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='treatmentfile', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + ] diff --git a/archaeological_finds/migrations/0112_migrate_created.py b/archaeological_finds/migrations/0112_migrate_created.py new file mode 100644 index 000000000..b1676c098 --- /dev/null +++ b/archaeological_finds/migrations/0112_migrate_created.py @@ -0,0 +1,27 @@ +# Generated by Django 2.2.24 on 2023-01-30 17:06 + +from django.db import migrations +from ishtar_common.utils_migrations import migrate_created_field + + +def migrate_created(apps, __): + app_name = "archaeological_finds" + model_names = [ + "BaseFind", + "Find", + "Property", + "Treatment", + "TreatmentFile", + ] + migrate_created_field(apps, app_name, model_names) + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0111_auto_20230130_1604'), + ] + + operations = [ + migrations.RunPython(migrate_created) + ] diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html index 85987c320..c3ab1c792 100644 --- a/archaeological_finds/templates/ishtar/sheet_basefind.html +++ b/archaeological_finds/templates/ishtar/sheet_basefind.html @@ -67,17 +67,7 @@ {% if not is_external %}

{% trans "Sheet"%}

- {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} - {% with item.history_creator.ishtaruser.full_label|add:"
"|add:creation_date|add:"" as creator %} - {% field_flex "Created by" creator|safe '' '' first %} - {% endwith %}{% endwith %} - {% if item.history_creation_date != item.last_edition_date %} - {% with item.last_edition_date|date:"SHORT_DATETIME_FORMAT" as edition_date %} - {% with item.history_modifier.ishtaruser.full_label|add:"
"|add:edition_date|add:"" as modifier %} - {% trans "Last modified by" as lastmodifiedby_label %} - {% field_flex lastmodifiedby_label modifier|safe '' '' first %} - {% endwith %}{% endwith %} - {% endif %} + {% include "ishtar/blocks/sheet_creation_section.html" %}
{% endif %} diff --git a/archaeological_operations/migrations/0111_auto_20230127_1503.py b/archaeological_operations/migrations/0111_auto_20230127_1503.py deleted file mode 100644 index 075422d9f..000000000 --- a/archaeological_operations/migrations/0111_auto_20230127_1503.py +++ /dev/null @@ -1,54 +0,0 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:03 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0110_auto_20220917_1818'), - ] - - operations = [ - migrations.AlterField( - model_name='archaeologicalsite', - name='geodata', - field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_operations_archaeologicalsite', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), - ), - migrations.AlterField( - model_name='archaeologicalsite', - name='main_geodata', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_operations_archaeologicalsite', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - migrations.AlterField( - model_name='historicalarchaeologicalsite', - name='main_geodata', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - migrations.AlterField( - model_name='historicaloperation', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='historicaloperation', - name='main_geodata', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - migrations.AlterField( - model_name='operation', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='operation', - name='geodata', - field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_operations_operation', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), - ), - migrations.AlterField( - model_name='operation', - name='main_geodata', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_operations_operation', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), - ), - ] diff --git a/archaeological_operations/migrations/0111_auto_20230130_1604.py b/archaeological_operations/migrations/0111_auto_20230130_1604.py new file mode 100644 index 000000000..4332347fe --- /dev/null +++ b/archaeological_operations/migrations/0111_auto_20230130_1604.py @@ -0,0 +1,95 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:04 + +import datetime +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0110_auto_20220917_1818'), + ] + + operations = [ + migrations.AddField( + model_name='administrativeact', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaladministrativeact', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicaloperation', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='operation', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='parcel', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='parcelowner', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='archaeologicalsite', + name='geodata', + field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_operations_archaeologicalsite', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), + ), + migrations.AlterField( + model_name='archaeologicalsite', + name='main_geodata', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_operations_archaeologicalsite', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + migrations.AlterField( + model_name='historicalarchaeologicalsite', + name='main_geodata', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + migrations.AlterField( + model_name='historicaloperation', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='historicaloperation', + name='main_geodata', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + migrations.AlterField( + model_name='operation', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='operation', + name='geodata', + field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_operations_operation', to='ishtar_common.GeoVectorData', verbose_name='Geodata'), + ), + migrations.AlterField( + model_name='operation', + name='main_geodata', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_operations_operation', to='ishtar_common.GeoVectorData', verbose_name='Main geodata'), + ), + ] diff --git a/archaeological_operations/migrations/0112_migrate_created.py b/archaeological_operations/migrations/0112_migrate_created.py new file mode 100644 index 000000000..19978e2f3 --- /dev/null +++ b/archaeological_operations/migrations/0112_migrate_created.py @@ -0,0 +1,27 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:14 + +from django.db import migrations +from ishtar_common.utils_migrations import migrate_created_field + + +def migrate_created(apps, __): + app_name = "archaeological_operations" + model_names = [ + "AdministrativeAct", + "ArchaeologicalSite", + "Operation", + "Parcel", + "ParcelOwner" + ] + migrate_created_field(apps, app_name, model_names) + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0111_auto_20230130_1604'), + ] + + operations = [ + migrations.RunPython(migrate_created) + ] diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 4a71ebc08..8d0b717a3 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -266,13 +266,6 @@ {% field_flex_full "Comment about scientific documentation" item.scientific_documentation_comment "
" "
" %} - {% if not is_external %} -

{% trans "Sheet"%}

-
- {% include "ishtar/blocks/sheet_creation_section.html" %} -
- {% endif %} - {% if item.virtual_operation %} + {% if not is_external %} +

{% trans "Sheet"%}

+
+ {% include "ishtar/blocks/sheet_creation_section.html" %} +
+ {% endif %} + {% if display_sites %} diff --git a/archaeological_warehouse/migrations/0116_auto_20230127_1504.py b/archaeological_warehouse/migrations/0116_auto_20230127_1504.py deleted file mode 100644 index 1134ef921..000000000 --- a/archaeological_warehouse/migrations/0116_auto_20230127_1504.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:04 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_warehouse', '0115_auto_20230120_1133'), - ] - - operations = [ - migrations.AddField( - model_name='historicalwarehouse', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AddField( - model_name='warehouse', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='container', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - ] diff --git a/archaeological_warehouse/migrations/0116_auto_20230130_1605.py b/archaeological_warehouse/migrations/0116_auto_20230130_1605.py new file mode 100644 index 000000000..bb25b02bd --- /dev/null +++ b/archaeological_warehouse/migrations/0116_auto_20230130_1605.py @@ -0,0 +1,44 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:05 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_warehouse', '0115_auto_20230120_1133'), + ] + + operations = [ + migrations.AddField( + model_name='container', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalwarehouse', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AddField( + model_name='historicalwarehouse', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='warehouse', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AddField( + model_name='warehouse', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='container', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + ] diff --git a/archaeological_warehouse/migrations/0117_migrate_created.py b/archaeological_warehouse/migrations/0117_migrate_created.py new file mode 100644 index 000000000..0c9962a59 --- /dev/null +++ b/archaeological_warehouse/migrations/0117_migrate_created.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.24 on 2023-01-30 17:20 + +from django.db import migrations +from ishtar_common.utils_migrations import migrate_created_field + + +def migrate_created(apps, __): + app_name = "archaeological_warehouse" + model_names = [ + "Warehouse", + "Container", + ] + migrate_created_field(apps, app_name, model_names) + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_warehouse', '0116_auto_20230130_1605'), + ] + + operations = [ + migrations.RunPython(migrate_created) + ] diff --git a/ishtar_common/migrations/0224_auto_20230127_1503.py b/ishtar_common/migrations/0224_auto_20230127_1503.py deleted file mode 100644 index 736e2a88d..000000000 --- a/ishtar_common/migrations/0224_auto_20230127_1503.py +++ /dev/null @@ -1,68 +0,0 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0223_auto_20230120_1124'), - ] - - operations = [ - migrations.AddField( - model_name='document', - name='cached_label', - field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='basefind_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Base find cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='container_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Container cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='contextrecord_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Context record cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='document_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Document cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='file_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='File cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='find_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Find cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='operation_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Operation cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='parcel_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Parcel cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='site_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Site cached label'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='warehouse_cached_label', - field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Warehouse cached label'), - ), - ] diff --git a/ishtar_common/migrations/0224_auto_20230130_1604.py b/ishtar_common/migrations/0224_auto_20230130_1604.py new file mode 100644 index 000000000..524caae16 --- /dev/null +++ b/ishtar_common/migrations/0224_auto_20230130_1604.py @@ -0,0 +1,94 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:04 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0223_auto_20230120_1124'), + ] + + operations = [ + migrations.AddField( + model_name='document', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'), + ), + migrations.AddField( + model_name='document', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalorganization', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='historicalperson', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='basefind_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Base find cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='container_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Container cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='contextrecord_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Context record cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='document_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Document cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='file_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='File cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='find_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Find cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='operation_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Operation cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='parcel_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Parcel cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='site_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Site cached label'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='warehouse_cached_label', + field=models.TextField(blank=True, default='', help_text='Formula to manage cached label. If not set a default is provided', verbose_name='Warehouse cached label'), + ), + migrations.AddField( + model_name='organization', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AddField( + model_name='person', + name='created', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + ] diff --git a/ishtar_common/migrations/0225_migrate_created.py b/ishtar_common/migrations/0225_migrate_created.py new file mode 100644 index 000000000..1304e8b92 --- /dev/null +++ b/ishtar_common/migrations/0225_migrate_created.py @@ -0,0 +1,25 @@ +# Generated by Django 2.2.24 on 2023-01-30 16:58 + +from django.db import migrations +from ishtar_common.utils_migrations import migrate_created_field + + +def migrate_created(apps, __): + app_name = "ishtar_common" + model_names = [ + "Document", + "Organization", + "Person", + ] + migrate_created_field(apps, app_name, model_names) + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0224_auto_20230130_1604'), + ] + + operations = [ + migrations.RunPython(migrate_created) + ] diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index f50395dee..2015a82da 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -1448,6 +1448,7 @@ class BaseHistorizedItem( null=True, ) last_modified = models.DateTimeField(blank=True, default=datetime.datetime.now) + created = models.DateTimeField(blank=True, default=datetime.datetime.now) history_m2m = JSONField(default=dict, blank=True) need_update = models.BooleanField(verbose_name=_("Need update"), default=False) locked = models.BooleanField( diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html index 46856cad0..78a5ca75f 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html @@ -6,10 +6,10 @@ {{item.history_creator.ishtaruser.person}} {{item.history_creator.ishtaruser.person|link_to_window:request}}
- {{item.history_creation_date|date:"DATETIME_FORMAT"}} + {{item.created|date:"DATETIME_FORMAT"}} {% endif %} -{% if not item.last_edition_date or item.history_creation_date != item.last_edition_date %} +{% if not item.last_edition_date or item.created != item.last_edition_date %}
diff --git a/ishtar_common/utils_migrations.py b/ishtar_common/utils_migrations.py index 44eae940e..ec0b46509 100644 --- a/ishtar_common/utils_migrations.py +++ b/ishtar_common/utils_migrations.py @@ -185,3 +185,18 @@ def set_uuid_helper(module, model_name): migrate_uuid(model) return set_uuid + + +def migrate_created_field(apps, app_name, model_names): + for model_name in model_names: + model = apps.get_model(app_name, model_name) + try: + model_history = apps.get_model(app_name, "Historical" + model_name) + except: + continue + for item in model.objects.all(): + q = model_history.objects.filter(id=item.pk).order_by("history_date") + if not q.count(): + continue + history_date = q.all()[0].history_date + item.__class__.objects.filter(pk=item.pk).update(created=history_date) diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 531eef995..839480ba7 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -1633,7 +1633,7 @@ def _get_json_stats( DEFAULT_ROW_NUMBER = 10 # length is used by ajax DataTables requests EXCLUDED_FIELDS = ["length"] -BASE_DATED_FIELDS = ["last_modified"] +BASE_DATED_FIELDS = ["created", "last_modified"] def get_item( diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index d8c789018..aa3ef68ab 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -2155,6 +2155,7 @@ DOCUMENT_EXCLUDED = models.Document.RELATED_MODELS + [ "search_vector", "imports", "last_modified", + "created", "document", ] -- cgit v1.2.3