diff options
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/migrations/0111_auto_20230130_1604.py (renamed from archaeological_finds/migrations/0111_auto_20230127_1504.py) | 48 | ||||
| -rw-r--r-- | archaeological_finds/migrations/0112_migrate_created.py | 27 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_basefind.html | 12 |
3 files changed, 75 insertions, 12 deletions
diff --git a/archaeological_finds/migrations/0111_auto_20230127_1504.py b/archaeological_finds/migrations/0111_auto_20230130_1604.py index e1d833e03..26a252c9a 100644 --- a/archaeological_finds/migrations/0111_auto_20230127_1504.py +++ b/archaeological_finds/migrations/0111_auto_20230130_1604.py @@ -1,5 +1,6 @@ -# Generated by Django 2.2.24 on 2023-01-27 15:04 +# 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 @@ -18,17 +19,42 @@ class Migration(migrations.Migration): 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'), ), @@ -44,6 +70,11 @@ class Migration(migrations.Migration): ), 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'), ), @@ -53,12 +84,22 @@ class Migration(migrations.Migration): 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'), ), @@ -74,6 +115,11 @@ class Migration(migrations.Migration): ), 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'), ), 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 %} <h3>{% trans "Sheet"%}</h3> <div class='row'> - {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} - {% with item.history_creator.ishtaruser.full_label|add:"<br/><i>"|add:creation_date|add:"</i>" 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:"<br/><i>"|add:edition_date|add:"</i>" 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" %} </div> {% endif %} </div> |