diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-04 13:32:06 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-04 13:32:06 +0200 |
commit | 42d0be484d96e2554c25711f5717519c68a10d6c (patch) | |
tree | 9368e318c4c6a9992485ea0855e3047fd3f1e160 | |
parent | cd01ae68c033115328003658c666bdb082f485bf (diff) | |
download | Ishtar-42d0be484d96e2554c25711f5717519c68a10d6c.tar.bz2 Ishtar-42d0be484d96e2554c25711f5717519c68a10d6c.zip |
Preservation module: models - change alteration and alteration causes for m2m (refs #3639)
-rw-r--r-- | archaeological_finds/migrations/0008_auto_20171004_1327.py (renamed from archaeological_finds/migrations/0008_auto_20171004_1125.py) | 20 | ||||
-rw-r--r-- | archaeological_finds/models_finds.py | 9 |
2 files changed, 10 insertions, 19 deletions
diff --git a/archaeological_finds/migrations/0008_auto_20171004_1125.py b/archaeological_finds/migrations/0008_auto_20171004_1327.py index 72d8f8973..0af50395a 100644 --- a/archaeological_finds/migrations/0008_auto_20171004_1125.py +++ b/archaeological_finds/migrations/0008_auto_20171004_1327.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-10-04 11:25 +# Generated by Django 1.11 on 2017-10-04 13:27 from __future__ import unicode_literals import django.core.validators @@ -98,13 +98,13 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='find', - name='alteration', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_finds.AlterationType', verbose_name='Alteration'), + name='alteration_causes', + field=models.ManyToManyField(blank=True, related_name='finds', to='archaeological_finds.AlterationCauseType', verbose_name='Alteration cause'), ), migrations.AddField( model_name='find', - name='alteration_cause', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_finds.AlterationCauseType', verbose_name='Alteration cause'), + name='alterations', + field=models.ManyToManyField(blank=True, related_name='finds', to='archaeological_finds.AlterationType', verbose_name='Alteration'), ), migrations.AddField( model_name='find', @@ -113,16 +113,6 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='historicalfind', - name='alteration', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='archaeological_finds.AlterationType'), - ), - migrations.AddField( - model_name='historicalfind', - name='alteration_cause', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='archaeological_finds.AlterationCauseType'), - ), - migrations.AddField( - model_name='historicalfind', name='treatment_emergency', field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='archaeological_finds.TreatmentEmergencyType'), ), diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index bf026c03f..3d379d2a7 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -716,12 +716,13 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, preservation_to_considers = models.ManyToManyField( PreservationType, verbose_name=_(u"Type of preservation to consider"), related_name='finds', blank=True) - alteration = models.ForeignKey( - AlterationType, verbose_name=_(u"Alteration"), blank=True, null=True + alterations = models.ManyToManyField( + AlterationType, verbose_name=_(u"Alteration"), blank=True, + related_name='finds' ) - alteration_cause = models.ForeignKey( + alteration_causes = models.ManyToManyField( AlterationCauseType, verbose_name=_(u"Alteration cause"), blank=True, - null=True + related_name='finds' ) treatment_emergency = models.ForeignKey( TreatmentEmergencyType, verbose_name=_(u"Treatment emergency"), |