diff options
author | Étienne Loks <etienne@peacefrogs.net> | 2019-02-06 15:31:06 +0100 |
---|---|---|
committer | Étienne Loks <etienne@peacefrogs.net> | 2019-02-06 15:31:06 +0100 |
commit | 4dc674ea9fa7516878a7b128da10ca9f09a6a1c7 (patch) | |
tree | 996f49e49c31c5c6644905ee3d9a3bf30da3bd1f /archaeological_finds | |
parent | 4cbb3429c3243e93597c2d2fbc668b444499c728 (diff) | |
download | Ishtar-4dc674ea9fa7516878a7b128da10ca9f09a6a1c7.tar.bz2 Ishtar-4dc674ea9fa7516878a7b128da10ca9f09a6a1c7.zip |
ForeignKey: SET_NULL fix
Diffstat (limited to 'archaeological_finds')
-rw-r--r-- | archaeological_finds/migrations/0060_auto_20190206_1522.py | 101 | ||||
-rw-r--r-- | archaeological_finds/models_finds.py | 7 | ||||
-rw-r--r-- | archaeological_finds/models_treatments.py | 3 |
3 files changed, 110 insertions, 1 deletions
diff --git a/archaeological_finds/migrations/0060_auto_20190206_1522.py b/archaeological_finds/migrations/0060_auto_20190206_1522.py new file mode 100644 index 000000000..ba0ad95b5 --- /dev/null +++ b/archaeological_finds/migrations/0060_auto_20190206_1522.py @@ -0,0 +1,101 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-06 15:22 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0059_auto_20190206_1442'), + ] + + operations = [ + migrations.AlterField( + model_name='alterationcausetype', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.AlterationCauseType', verbose_name='Parent'), + ), + migrations.AlterField( + model_name='alterationtype', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.AlterationType', verbose_name='Parent'), + ), + migrations.AlterField( + model_name='basefind', + name='batch', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.BatchType', verbose_name='Lot/objet'), + ), + migrations.AlterField( + model_name='basefind', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ishtar_common.SpatialReferenceSystem', verbose_name='Syst\xe8me de r\xe9f\xe9rence spatiale'), + ), + migrations.AlterField( + model_name='communicabilitytype', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.CommunicabilityType', verbose_name='Parent'), + ), + migrations.AlterField( + model_name='conservatorystate', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.ConservatoryState', verbose_name='Parent'), + ), + migrations.AlterField( + model_name='find', + name='checked_type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.CheckedType', verbose_name='V\xe9rification'), + ), + migrations.AlterField( + model_name='find', + name='material_type_quality', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='finds', to='archaeological_finds.MaterialTypeQualityType', verbose_name='Qualit\xe9 du type de mat\xe9riaux'), + ), + migrations.AlterField( + model_name='find', + name='object_type_quality', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='finds', to='archaeological_finds.ObjectTypeQualityType', verbose_name="Qualit\xe9 du type d'objet"), + ), + migrations.AlterField( + model_name='find', + name='treatment_emergency', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.TreatmentEmergencyType', verbose_name='Urgence du traitement'), + ), + migrations.AlterField( + model_name='findbasket', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='findbaskets', to='ishtar_common.IshtarUser', verbose_name='Propri\xe9taire'), + ), + migrations.AlterField( + model_name='materialtype', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.MaterialType', verbose_name='Parent'), + ), + migrations.AlterField( + model_name='objecttype', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.ObjectType', verbose_name='Parent'), + ), + migrations.AlterField( + model_name='treatment', + name='container', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_warehouse.Container', verbose_name='Contenant'), + ), + migrations.AlterField( + model_name='treatment', + name='file', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='treatments', to='archaeological_finds.TreatmentFile', verbose_name='Demande associ\xe9e'), + ), + migrations.AlterField( + model_name='treatment', + name='location', + field=models.ForeignKey(blank=True, help_text='Endroit o\xf9 le traitement est r\xe9alis\xe9. Renseignez le lieu de conservation de destination pour un d\xe9placement.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_warehouse.Warehouse', verbose_name='Localisation'), + ), + migrations.AlterField( + model_name='treatmenttype', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_finds.TreatmentType', verbose_name='Parent'), + ), + ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 1bc774aa2..ad15aea88 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -284,6 +284,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): discovery_date_taq = models.DateField(_(u"Discovery date (TAQ)"), blank=True, null=True) batch = models.ForeignKey(BatchType, verbose_name=_(u"Batch/object"), + on_delete=models.SET_NULL, blank=True, null=True) index = models.IntegerField(u"Index", default=0) material_index = models.IntegerField(_(u"Material index"), default=0) @@ -301,6 +302,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): blank=True, null=True) spatial_reference_system = models.ForeignKey( SpatialReferenceSystem, verbose_name=_(u"Spatial Reference System"), + on_delete=models.SET_NULL, blank=True, null=True) point_2d = models.PointField(_(u"Point (2D)"), blank=True, null=True) point = models.PointField(_(u"Point (3D)"), blank=True, null=True, dim=3) @@ -1097,6 +1099,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, material_type_quality = models.ForeignKey( MaterialTypeQualityType, verbose_name=_(u"Material type quality"), related_name='finds', + on_delete=models.SET_NULL, blank=True, null=True ) volume = models.FloatField(_(u"Volume (l)"), blank=True, null=True) @@ -1131,7 +1134,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, object_type_quality = models.ForeignKey( ObjectTypeQualityType, verbose_name=_(u"Object type quality"), related_name='finds', - blank=True, null=True + on_delete=models.SET_NULL, blank=True, null=True ) integrities = models.ManyToManyField( IntegrityType, verbose_name=_(u"Integrity / interest"), @@ -1166,6 +1169,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, previous_id = models.TextField(_(u"Previous ID"), blank=True, null=True) index = models.IntegerField(u"Index", default=0) checked_type = models.ForeignKey(CheckedType, verbose_name=_(u"Check"), + on_delete=models.SET_NULL, blank=True, null=True) check_date = models.DateField(_(u"Check date"), default=datetime.date.today) @@ -1195,6 +1199,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, ) treatment_emergency = models.ForeignKey( TreatmentEmergencyType, verbose_name=_(u"Treatment emergency"), + on_delete=models.SET_NULL, blank=True, null=True ) insurance_value = models.FloatField(_(u"Insurance value"), blank=True, diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index a1e0a0437..041721d68 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -138,6 +138,7 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem, index = models.IntegerField(_(u"Index"), default=1) file = models.ForeignKey( 'TreatmentFile', related_name='treatments', blank=True, null=True, + on_delete=models.SET_NULL, verbose_name=_(u"Associated request")) treatment_types = models.ManyToManyField( TreatmentType, verbose_name=_(u"Treatment type")) @@ -149,6 +150,7 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem, _(u"Treatment have been executed"), default=False) location = models.ForeignKey( Warehouse, verbose_name=_(u"Location"), blank=True, null=True, + on_delete=models.SET_NULL, help_text=_( u"Location where the treatment is done. Target warehouse for " u"a move.")) @@ -167,6 +169,7 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem, end_date = models.DateField(_(u"Closing date"), blank=True, null=True) creation_date = models.DateTimeField(default=datetime.datetime.now) container = models.ForeignKey(Container, verbose_name=_(u"Container"), + on_delete=models.SET_NULL, blank=True, null=True) estimated_cost = models.FloatField(_(u"Estimated cost"), blank=True, null=True) |