summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_finds/migrations/0115_auto_20240215_1547.py2
-rw-r--r--ishtar_common/migrations/0236_auto_20240218_1726.py (renamed from ishtar_common/migrations/0236_auto_20240215_1547.py)32
-rw-r--r--ishtar_common/migrations/0237_data_migration_licenses_shootingangle.py2
-rw-r--r--ishtar_common/migrations/0238_auto_20240216_1434.py89
4 files changed, 30 insertions, 95 deletions
diff --git a/archaeological_finds/migrations/0115_auto_20240215_1547.py b/archaeological_finds/migrations/0115_auto_20240215_1547.py
index 4bfaec94e..9c2907775 100644
--- a/archaeological_finds/migrations/0115_auto_20240215_1547.py
+++ b/archaeological_finds/migrations/0115_auto_20240215_1547.py
@@ -10,7 +10,7 @@ import re
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0236_auto_20240215_1547'),
+ ('ishtar_common', '0236_auto_20240218_1726'),
('archaeological_finds', '0114_auto_20231115_1617'),
]
diff --git a/ishtar_common/migrations/0236_auto_20240215_1547.py b/ishtar_common/migrations/0236_auto_20240218_1726.py
index 4a2897560..39bee4796 100644
--- a/ishtar_common/migrations/0236_auto_20240215_1547.py
+++ b/ishtar_common/migrations/0236_auto_20240218_1726.py
@@ -1,8 +1,13 @@
-# Generated by Django 2.2.24 on 2024-02-15 15:47
+# Generated by Django 2.2.24 on 2024-02-18 17:26
+import datetime
+from django.conf import settings
+import django.contrib.postgres.fields.jsonb
+import django.contrib.postgres.search
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
+import ishtar_common.models
import ishtar_common.models_common
import re
@@ -10,6 +15,7 @@ import re
class Migration(migrations.Migration):
dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('ishtar_common', '0235_default_geo_types'),
]
@@ -99,6 +105,15 @@ class Migration(migrations.Migration):
name='BiographicalNote',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('search_vector', django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector')),
+ ('timestamp_geo', models.IntegerField(blank=True, null=True, verbose_name='Timestamp geo')),
+ ('timestamp_label', models.IntegerField(blank=True, null=True, verbose_name='Timestamp label')),
+ ('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)),
+ ('last_modified', models.DateTimeField(blank=True, default=datetime.datetime.now)),
+ ('created', models.DateTimeField(blank=True, default=datetime.datetime.now)),
+ ('history_m2m', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)),
+ ('need_update', models.BooleanField(default=False, verbose_name='Need update')),
+ ('locked', models.BooleanField(default=False, verbose_name='Item locked for edition')),
('denomination', models.TextField(verbose_name='Denomination')),
('last_name', models.TextField(blank=True, default='', verbose_name='Last name')),
('first_name', models.TextField(blank=True, default='', verbose_name='First name')),
@@ -106,10 +121,19 @@ 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')),
+ ('history_creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Creator')),
+ ('history_modifier', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Last editor')),
+ ('imports', models.ManyToManyField(blank=True, related_name='imported_ishtar_common_biographicalnote', to='ishtar_common.Import')),
+ ('imports_updated', models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_biographicalnote', to='ishtar_common.Import')),
+ ('lock_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Locked by')),
+ ('organization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='biographical_notes', to='ishtar_common.Organization', verbose_name='Organization')),
+ ('person', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='biographical_notes', to='ishtar_common.Person', verbose_name='Person')),
],
- options={'verbose_name': 'Biographical note', 'verbose_name_plural': 'Biographical notes'},
+ options={
+ 'verbose_name': 'Biographical note',
+ 'verbose_name_plural': 'Biographical notes',
+ },
+ bases=(ishtar_common.models_common.StatisticItem, ishtar_common.models_common.TemplateItem, models.Model, ishtar_common.models_common.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.ValueGetter, ishtar_common.models_common.MainItem),
),
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 9d5190c15..bfebf20b5 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_20240215_1547'),
+ ('ishtar_common', '0236_auto_20240218_1726'),
]
operations = [
diff --git a/ishtar_common/migrations/0238_auto_20240216_1434.py b/ishtar_common/migrations/0238_auto_20240216_1434.py
deleted file mode 100644
index 39c702b9c..000000000
--- a/ishtar_common/migrations/0238_auto_20240216_1434.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# Generated by Django 2.2.24 on 2024-02-16 14:34
-
-import datetime
-from django.conf import settings
-import django.contrib.postgres.fields.jsonb
-import django.contrib.postgres.search
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('ishtar_common', '0237_data_migration_licenses_shootingangle'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='biographicalnote',
- name='created',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='data',
- field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='history_creator',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Creator'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='history_m2m',
- field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='history_modifier',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Last editor'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='imports',
- field=models.ManyToManyField(blank=True, related_name='imported_ishtar_common_biographicalnote', to='ishtar_common.Import'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='imports_updated',
- field=models.ManyToManyField(blank=True, related_name='import_updated_ishtar_common_biographicalnote', to='ishtar_common.Import'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='last_modified',
- field=models.DateTimeField(blank=True, default=datetime.datetime.now),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='lock_user',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Locked by'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='locked',
- field=models.BooleanField(default=False, verbose_name='Item locked for edition'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='need_update',
- field=models.BooleanField(default=False, verbose_name='Need update'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='search_vector',
- field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='timestamp_geo',
- field=models.IntegerField(blank=True, null=True, verbose_name='Timestamp geo'),
- ),
- migrations.AddField(
- model_name='biographicalnote',
- name='timestamp_label',
- field=models.IntegerField(blank=True, null=True, verbose_name='Timestamp label'),
- ),
- ]
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 17:04:41 +0000