From 7f3f35d172c8dd7b56bd88778c3cbe4d65a5da58 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 18 Nov 2020 16:46:37 +0100 Subject: Complex index generation with JINJA2 templates --- ishtar_common/migrations/0201_squashed.py | 16 ++++- .../migrations/0207_auto_20201117_1021.py | 70 ------------------- .../migrations/0207_auto_20201118_1210.py | 80 ++++++++++++++++++++++ 3 files changed, 93 insertions(+), 73 deletions(-) delete mode 100644 ishtar_common/migrations/0207_auto_20201117_1021.py create mode 100644 ishtar_common/migrations/0207_auto_20201118_1210.py (limited to 'ishtar_common/migrations') diff --git a/ishtar_common/migrations/0201_squashed.py b/ishtar_common/migrations/0201_squashed.py index d7b65626a..5e97e5f08 100644 --- a/ishtar_common/migrations/0201_squashed.py +++ b/ishtar_common/migrations/0201_squashed.py @@ -12,6 +12,7 @@ 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 import uuid @@ -207,7 +208,8 @@ class Migration(migrations.Migration): ishtar_common.models.TemplateItem, ishtar_common.models.OwnPerms, models.Model, ishtar_common.models.CachedGen, - ishtar_common.models.FixAssociated, ishtar_common.models.CascasdeUpdate, ishtar_common.models.ImageContainerModel, ishtar_common.models.ValueGetter, ishtar_common.models.MainItem), + ishtar_common.models_common.FixAssociated, + ishtar_common.models.CascasdeUpdate, ishtar_common.models.ImageContainerModel, ishtar_common.models.ValueGetter, ishtar_common.models.MainItem), ), migrations.CreateModel( name='DocumentTemplate', @@ -751,7 +753,11 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Organizations', 'permissions': (('view_organization', 'Can view all Organizations'), ('view_own_organization', 'Can view own Organization'), ('add_own_organization', 'Can add own Organization'), ('change_own_organization', 'Can change own Organization'), ('delete_own_organization', 'Can delete own Organization')), }, - bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models.FixAssociated, ishtar_common.models.CascasdeUpdate, ishtar_common.models.OwnPerms, ishtar_common.models.ValueGetter, ishtar_common.models.MainItem), + bases=(ishtar_common.models.StatisticItem, + ishtar_common.models.TemplateItem, models.Model, + ishtar_common.models.CachedGen, + ishtar_common.models_common.FixAssociated, + ishtar_common.models.CascasdeUpdate, ishtar_common.models.OwnPerms, ishtar_common.models.ValueGetter, ishtar_common.models.MainItem), ), migrations.CreateModel( name='OrganizationType', @@ -823,7 +829,11 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Persons', 'permissions': (('view_person', 'Can view all Persons'), ('view_own_person', 'Can view own Person'), ('add_own_person', 'Can add own Person'), ('change_own_person', 'Can change own Person'), ('delete_own_person', 'Can delete own Person')), }, - bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models.FixAssociated, ishtar_common.models.CascasdeUpdate, ishtar_common.models.OwnPerms, ishtar_common.models.ValueGetter, ishtar_common.models.MainItem), + bases=(ishtar_common.models.StatisticItem, + ishtar_common.models.TemplateItem, models.Model, + ishtar_common.models.CachedGen, + ishtar_common.models_common.FixAssociated, + ishtar_common.models.CascasdeUpdate, ishtar_common.models.OwnPerms, ishtar_common.models.ValueGetter, ishtar_common.models.MainItem), ), migrations.CreateModel( name='PersonType', diff --git a/ishtar_common/migrations/0207_auto_20201117_1021.py b/ishtar_common/migrations/0207_auto_20201117_1021.py deleted file mode 100644 index bd6d970fe..000000000 --- a/ishtar_common/migrations/0207_auto_20201117_1021.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-11-17 10:21 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0206_auto_20201110_1030'), - ] - - operations = [ - migrations.RenameField( - model_name='ishtarsiteprofile', - old_name='context_record_complete_identifier', - new_name='contextrecord_complete_identifier', - ), - migrations.AddField( - model_name='document', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='basefind_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage base find custom index.', verbose_name='Base find custom index key'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='container_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage container custom index.', verbose_name='Container custom index key'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='contextrecord_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage context record custom index.', verbose_name='Context record custom index key'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='document_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage document custom index.', verbose_name='Document custom index key'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='file_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage archaeological file custom index.', verbose_name='Archaeological file custom index key'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='find_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage find custom index.', verbose_name='Find custom index key'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='operation_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage operation custom index.', verbose_name='Operation custom index key'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='site_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage archaeological site custom index.', verbose_name='Archaeological site custom index key'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='warehouse_custom_index', - field=models.TextField(default='', help_text='Key to be used to manage warehouse custom index.', verbose_name='Warehouse custom index key'), - ), - ] diff --git a/ishtar_common/migrations/0207_auto_20201118_1210.py b/ishtar_common/migrations/0207_auto_20201118_1210.py new file mode 100644 index 000000000..343577182 --- /dev/null +++ b/ishtar_common/migrations/0207_auto_20201118_1210.py @@ -0,0 +1,80 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-11-18 12:10 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0206_auto_20201110_1030'), + ] + + operations = [ + migrations.RenameField( + model_name='ishtarsiteprofile', + old_name='context_record_complete_identifier', + new_name='contextrecord_complete_identifier', + ), + migrations.AddField( + model_name='document', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='basefind_custom_index', + field=models.TextField(default='', help_text='Key to be used to manage base find custom index. Separate keys with a semicolon.', verbose_name='Base find custom index key'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='container_custom_index', + field=models.TextField(default='', help_text='Key to be used to manage container custom index. Separate keys with a semicolon.', verbose_name='Container custom index key'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='contextrecord_custom_index', + field=models.TextField(default='', help_text='Key to be used to manage context record custom index. Separate keys with a semicolon.', verbose_name='Context record custom index key'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='document_custom_index', + field=models.TextField(default='', help_text='Key to be used to manage document custom index. Separate keys with a semicolon.', verbose_name='Document custom index key'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='file_custom_index', + field=models.TextField(default='', help_text='Key to be used to manage archaeological file custom index. Separate keys with a semicolon.', verbose_name='Archaeological file custom index key'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='find_custom_index', + field=models.TextField(default='', help_text='Key to be used to manage find custom index. Separate keys with a semicolon.', verbose_name='Find custom index key'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='operation_custom_index', + field=models.TextField(default='', help_text='Keys to be used to manage operation custom index. Separate keys with a semicolon.', verbose_name='Operation custom index key'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='site_custom_index', + field=models.TextField(default='', help_text='Key to be used to manage archaeological site custom index. Separate keys with a semicolon.', verbose_name='Archaeological site custom index key'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='warehouse_custom_index', + field=models.TextField(default='', help_text='Key to be used to manage warehouse custom index. Separate keys with a semicolon.', verbose_name='Warehouse custom index key'), + ), + migrations.AddField( + model_name='sourcetype', + name='code', + field=models.CharField(blank=True, default='', max_length=100, verbose_name='Code'), + ), + migrations.AlterField( + model_name='sourcetype', + name='coins_genre', + field=models.CharField(blank=True, default='', max_length=100, verbose_name='COInS export - genre'), + ), + ] -- cgit v1.2.3