diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-28 17:42:25 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-28 17:42:25 +0100 |
commit | 328d9d691da17843b4a7fb3d1b3c7bcae3538da1 (patch) | |
tree | 4f8bf4175f9fa30837be46f472f65c8d3bbc0b87 /archaeological_finds | |
parent | e81251c55c9fcb82505767d45285d0657a795941 (diff) | |
download | Ishtar-328d9d691da17843b4a7fb3d1b3c7bcae3538da1.tar.bz2 Ishtar-328d9d691da17843b4a7fb3d1b3c7bcae3538da1.zip |
Finds: add missing fields
Diffstat (limited to 'archaeological_finds')
-rw-r--r-- | archaeological_finds/migrations/0017_auto_20180228_1741.py | 81 | ||||
-rw-r--r-- | archaeological_finds/models_finds.py | 12 |
2 files changed, 87 insertions, 6 deletions
diff --git a/archaeological_finds/migrations/0017_auto_20180228_1741.py b/archaeological_finds/migrations/0017_auto_20180228_1741.py new file mode 100644 index 000000000..f33e067a1 --- /dev/null +++ b/archaeological_finds/migrations/0017_auto_20180228_1741.py @@ -0,0 +1,81 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-02-28 17:41 +from __future__ import unicode_literals + +from django.db import migrations, models +import virtualtime + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0016_auto_20180215_1154'), + ] + + operations = [ + migrations.AddField( + model_name='basefind', + name='excavation_id', + field=models.TextField(blank=True, null=True, verbose_name='Excavation ID'), + ), + migrations.AddField( + model_name='find', + name='decoration', + field=models.TextField(blank=True, null=True, verbose_name='Decoration'), + ), + migrations.AddField( + model_name='find', + name='denomination', + field=models.TextField(blank=True, null=True, verbose_name='Label'), + ), + migrations.AddField( + model_name='find', + name='manufacturing_place', + field=models.TextField(blank=True, null=True, verbose_name='Manufacturing place'), + ), + migrations.AddField( + model_name='find', + name='museum_id', + field=models.TextField(blank=True, null=True, verbose_name='Museum ID'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='excavation_id', + field=models.TextField(blank=True, null=True, verbose_name='Excavation ID'), + ), + migrations.AddField( + model_name='historicalfind', + name='decoration', + field=models.TextField(blank=True, null=True, verbose_name='Decoration'), + ), + migrations.AddField( + model_name='historicalfind', + name='denomination', + field=models.TextField(blank=True, null=True, verbose_name='Label'), + ), + migrations.AddField( + model_name='historicalfind', + name='manufacturing_place', + field=models.TextField(blank=True, null=True, verbose_name='Manufacturing place'), + ), + migrations.AddField( + model_name='historicalfind', + name='museum_id', + field=models.TextField(blank=True, null=True, verbose_name='Museum ID'), + ), + migrations.AlterField( + model_name='find', + name='weight', + field=models.FloatField(blank=True, null=True, verbose_name='Weight'), + ), + migrations.AlterField( + model_name='historicalfind', + name='weight', + field=models.FloatField(blank=True, null=True, verbose_name='Weight'), + ), + migrations.AlterField( + model_name='property', + name='history_date', + field=models.DateTimeField(default=virtualtime.datetime.now), + ), + ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 7f36492a1..047c08ffc 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -211,7 +211,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): external_id = models.TextField(_(u"External ID"), blank=True, null=True) auto_external_id = models.BooleanField( _(u"External ID is set automatically"), default=False) - #excavation_id = models.TextField(_(u"Excavation ID"), blank=True, null=True) + excavation_id = models.TextField(_(u"Excavation ID"), blank=True, null=True) description = models.TextField(_(u"Description"), blank=True, null=True) comment = models.TextField(_(u"Comment"), blank=True, null=True) special_interest = models.CharField(_(u"Special interest"), blank=True, @@ -680,12 +680,12 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, _(u"External ID is set automatically"), default=False) order = models.IntegerField(_(u"Order"), default=1) label = models.TextField(_(u"Free ID")) - #denomination = models.TextField(_(u"Label"), blank=True, null=True) - #museum_id = models.TextField(_(u"Museum ID"), blank=True, null=True) + denomination = models.TextField(_(u"Label"), blank=True, null=True) + museum_id = models.TextField(_(u"Museum ID"), blank=True, null=True) description = models.TextField(_(u"Description"), blank=True, null=True) - #decoration = models.TextField(_(u"Decoration"), blank=True, null=True) - #manufacturing_place = models.TextField( - # _(u"Manufacturing place"), blank=True, null=True) + decoration = models.TextField(_(u"Decoration"), blank=True, null=True) + manufacturing_place = models.TextField( + _(u"Manufacturing place"), blank=True, null=True) material_types = models.ManyToManyField( MaterialType, verbose_name=_(u"Material types"), related_name='finds', blank=True |