diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-02-15 15:58:23 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-04-16 16:41:51 +0200 |
| commit | 3c5dac4fae65cfa0ce81e948318bdc4d9bd3af49 (patch) | |
| tree | a2caef3fae5f2c84f01eb4ebcc96a32b02a5ee2c /ishtar_common/migrations | |
| parent | b0686329d8d722070ab6304f44bcc256d04b50ed (diff) | |
| download | Ishtar-3c5dac4fae65cfa0ce81e948318bdc4d9bd3af49.tar.bz2 Ishtar-3c5dac4fae65cfa0ce81e948318bdc4d9bd3af49.zip | |
🗃️ biographical notes - model, admin: add organization
Diffstat (limited to 'ishtar_common/migrations')
| -rw-r--r-- | ishtar_common/migrations/0236_auto_20240215_1547.py (renamed from ishtar_common/migrations/0236_auto_20240209_1558.py) | 6 | ||||
| -rw-r--r-- | ishtar_common/migrations/0237_data_migration_licenses_shootingangle.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ishtar_common/migrations/0236_auto_20240209_1558.py b/ishtar_common/migrations/0236_auto_20240215_1547.py index 6fd6014fe..4a2897560 100644 --- a/ishtar_common/migrations/0236_auto_20240209_1558.py +++ b/ishtar_common/migrations/0236_auto_20240215_1547.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2024-02-09 15:58 +# Generated by Django 2.2.24 on 2024-02-15 15:47 import django.core.validators from django.db import migrations, models @@ -68,7 +68,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='ishtarsiteprofile', name='museum_complete_identifier', - field=models.TextField(default='{{museum_id_prefix}}.{{museum_id}}.{{museum_id_suffix}}', help_text='Formula to manage cached label. If not set a default formula is used.', verbose_name='Find - Complete museum ID'), + field=models.TextField(default='{% if museum_id_prefix %}{{museum_id_prefix}}.{% endif %}{{museum_id}}{% if museum_id_suffix %}.{{museum_id_suffix}}{% endif %}', help_text='Formula to manage cached label. If not set a default formula is used.', verbose_name='Find - Complete museum ID'), ), migrations.AddField( model_name='licensetype', @@ -106,8 +106,10 @@ class Migration(migrations.Migration): ('death_year', models.PositiveIntegerField(blank=True, null=True, verbose_name='Year of death')), ('biography', models.TextField(blank=True, default='', verbose_name='Biography')), ('biography_format', models.CharField(blank=True, choices=[('NO', 'None'), ('MD', 'Markdown'), ('HT', 'HTML')], default='NO', max_length=2, verbose_name='Biography format')), + ('organization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ishtar_common.Organization', verbose_name='Organization')), ('person', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ishtar_common.Person', verbose_name='Person')), ], + options={'verbose_name': 'Biographical note', 'verbose_name_plural': 'Biographical notes'}, ), migrations.AddField( model_name='document', diff --git a/ishtar_common/migrations/0237_data_migration_licenses_shootingangle.py b/ishtar_common/migrations/0237_data_migration_licenses_shootingangle.py index ec25de658..9d5190c15 100644 --- a/ishtar_common/migrations/0237_data_migration_licenses_shootingangle.py +++ b/ishtar_common/migrations/0237_data_migration_licenses_shootingangle.py @@ -14,7 +14,7 @@ def load_data(_, __): class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0236_auto_20240209_1558'), + ('ishtar_common', '0236_auto_20240215_1547'), ] operations = [ |