diff options
| -rw-r--r-- | archaeological_finds/migrations/0066_auto_20190527_1811.py | 109 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 29 | ||||
| m--------- | drassm_app | 0 |
3 files changed, 134 insertions, 4 deletions
diff --git a/archaeological_finds/migrations/0066_auto_20190527_1811.py b/archaeological_finds/migrations/0066_auto_20190527_1811.py new file mode 100644 index 000000000..303b39342 --- /dev/null +++ b/archaeological_finds/migrations/0066_auto_20190527_1811.py @@ -0,0 +1,109 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.18 on 2019-05-27 18:11 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0065_auto_20190225_1637'), + ] + + operations = [ + migrations.AlterModelOptions( + name='findbasket', + options={'ordering': ('label',), 'permissions': (('view_find', 'Can view all Finds'), ('view_own_find', 'Can view own Find')), 'verbose_name': 'Panier'}, + ), + migrations.AddField( + model_name='find', + name='cached_materials', + field=models.TextField(blank=True, help_text='Generated automatically - do not edit', null=True, verbose_name='Cached material types label'), + ), + migrations.AddField( + model_name='find', + name='cached_object_types', + field=models.TextField(blank=True, help_text='Generated automatically - do not edit', null=True, verbose_name='Cached object types label'), + ), + migrations.AddField( + model_name='find', + name='cached_periods', + field=models.TextField(blank=True, help_text='Generated automatically - do not edit', null=True, verbose_name='Cached periods label'), + ), + migrations.AddField( + model_name='historicalfind', + name='cached_materials', + field=models.TextField(blank=True, help_text='Generated automatically - do not edit', null=True, verbose_name='Cached material types label'), + ), + migrations.AddField( + model_name='historicalfind', + name='cached_object_types', + field=models.TextField(blank=True, help_text='Generated automatically - do not edit', null=True, verbose_name='Cached object types label'), + ), + migrations.AddField( + model_name='historicalfind', + name='cached_periods', + field=models.TextField(blank=True, help_text='Generated automatically - do not edit', null=True, verbose_name='Cached periods label'), + ), + migrations.AlterField( + model_name='basefind', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[('T', 'Commune'), ('P', 'Précis'), ('M', 'Polygone')], max_length=1, null=True, verbose_name='Source du multi-polygone'), + ), + migrations.AlterField( + model_name='basefind', + name='multi_polygon_source_item', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Élément source du multi-polygone'), + ), + migrations.AlterField( + model_name='basefind', + name='point_source', + field=models.CharField(blank=True, choices=[('T', 'Commune'), ('P', 'Précis'), ('M', 'Polygone')], max_length=1, null=True, verbose_name='Source du point'), + ), + migrations.AlterField( + model_name='basefind', + name='point_source_item', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Élément source du point'), + ), + migrations.AlterField( + model_name='find', + name='material_comment', + field=models.TextField(blank=True, null=True, verbose_name='Commentaire relatif au matériau'), + ), + migrations.AlterField( + model_name='find', + name='weight_unit', + field=models.CharField(blank=True, choices=[('g', 'g'), ('kg', 'kg')], max_length=4, null=True, verbose_name='Unité de poids'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[('T', 'Commune'), ('P', 'Précis'), ('M', 'Polygone')], max_length=1, null=True, verbose_name='Source du multi-polygone'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='multi_polygon_source_item', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Élément source du multi-polygone'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='point_source', + field=models.CharField(blank=True, choices=[('T', 'Commune'), ('P', 'Précis'), ('M', 'Polygone')], max_length=1, null=True, verbose_name='Source du point'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='point_source_item', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Élément source du point'), + ), + migrations.AlterField( + model_name='historicalfind', + name='material_comment', + field=models.TextField(blank=True, null=True, verbose_name='Commentaire relatif au matériau'), + ), + migrations.AlterField( + model_name='historicalfind', + name='weight_unit', + field=models.CharField(blank=True, choices=[('g', 'g'), ('kg', 'kg')], max_length=4, null=True, verbose_name='Unité de poids'), + ), + ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index ec8a5367e..69d9e92bf 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -754,8 +754,8 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, 'base_finds__context_record__town__name', 'base_finds__context_record__operation__common_name', 'base_finds__context_record__label', - 'material_types__label', 'object_types__label', - 'datings__period__label', + 'cached_materials', 'cached_object_types', + 'cached_periods', 'container__cached_label', 'container_ref__cached_label'] if settings.COUNTRY == 'fr': @@ -764,13 +764,17 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, TABLE_COLS_FOR_OPE = [ 'base_finds__cache_short_id', 'base_finds__cache_complete_id', - 'previous_id', 'label', 'material_types__label', - 'datings__period__label', 'find_number', 'object_types__label', + 'previous_id', 'label', + 'cached_materials', + 'cached_periods', + 'find_number', + 'cached_object_types', 'container__cached_label', 'container_ref__cached_label', 'description', 'base_finds__context_record__town__name', 'base_finds__context_record__parcel', ] + NEW_QUERY_ENGINE = True COL_LABELS = { 'base_finds__context_record__label': _(u"Context record"), 'base_finds__cache_short_id': _(u"Base find - Short ID"), @@ -798,8 +802,11 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, 'container__cached_label': _(u"Current container"), 'container_ref__cached_label': _(u"Reference container"), 'datings__period__label': _(u"Periods"), + 'cached_periods': _(u"Periods"), 'material_types__label': _(u"Material types"), + 'cached_materials': _(u"Material types"), 'object_types__label': _(u"Object types"), + 'cached_object_types': _(u"Object types"), } EXTRA_FULL_FIELDS = [ @@ -1413,6 +1420,8 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, 'remarkabilities', 'communicabilities', 'preservation_to_considers', 'alterations', 'alteration_causes' ] + CACHED_LABELS = ['cached_label', 'cached_periods', + 'cached_object_types', 'cached_materials'] objects = ExternalIdManager() # fields @@ -1563,6 +1572,18 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, help_text=_(u"Related treatments when no new find is created")) cached_label = models.TextField(_(u"Cached name"), null=True, blank=True, db_index=True) + cached_periods = models.TextField( + _("Cached periods label"), blank=True, null=True, + help_text=_("Generated automatically - do not edit") + ) + cached_object_types = models.TextField( + _("Cached object types label"), blank=True, null=True, + help_text=_("Generated automatically - do not edit") + ) + cached_materials = models.TextField( + _("Cached material types label"), blank=True, null=True, + help_text=_("Generated automatically - do not edit") + ) history = HistoricalRecords(bases=[HistoryModel]) BASKET_MODEL = FindBasket diff --git a/drassm_app b/drassm_app -Subproject db4ff79c01fb71527bac6c00fd1d6831bb90d27 +Subproject d1b04adfba3d97648c7ebdedfe2536ca2c23844 |