From a77bc65d7b7276498f367962083cb6fd2120b631 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 29 Feb 2016 20:12:41 +0000 Subject: [PATCH 1/3] Changed delete condition to SET_NULL - closes #199 --- RIGS/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/models.py b/RIGS/models.py index 09b3080a..fc06911f 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -301,7 +301,7 @@ class Event(models.Model, RevisionMixin): status = models.IntegerField(choices=EVENT_STATUS_CHOICES, default=PROVISIONAL) dry_hire = models.BooleanField(default=False) is_rig = models.BooleanField(default=True) - based_on = models.ForeignKey('Event', related_name='future_events', blank=True, null=True) + based_on = models.ForeignKey('Event', on_delete=models.SET_NULL, related_name='future_events', blank=True, null=True) # Timing start_date = models.DateField() From e3adfecd17036fd694e8ce762ff2860d97b0a247 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 29 Feb 2016 20:43:11 +0000 Subject: [PATCH 2/3] Added database migration --- RIGS/migrations/0024_auto_20160229_2042.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 RIGS/migrations/0024_auto_20160229_2042.py diff --git a/RIGS/migrations/0024_auto_20160229_2042.py b/RIGS/migrations/0024_auto_20160229_2042.py new file mode 100644 index 00000000..163ff8e4 --- /dev/null +++ b/RIGS/migrations/0024_auto_20160229_2042.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0023_auto_20150529_0048'), + ] + + operations = [ + migrations.AlterField( + model_name='event', + name='based_on', + field=models.ForeignKey(related_name='future_events', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='RIGS.Event', null=True), + ), + ] From 67b2bc6d5428854f3a70eaeb0789f91e29a755f9 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 29 Feb 2016 20:44:09 +0000 Subject: [PATCH 3/3] Applied migration to development database --- db.sqlite3 | Bin 82944 -> 84992 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/db.sqlite3 b/db.sqlite3 index d0e8fed8d67a99e4d84aaca79726634d5103571e..07462b3f640fb99ec6f986f85dfa5d5315cc4d15 100644 GIT binary patch delta 753 zcmW-eZ%ET&5XYbU-EX?wM%vWOEtuuZQFH6(W=y5j%28W7^^HU_jABhn`=kA#0v~(f zs%>o^LG`v?1VLrLa8SK4U(}1Ds29=;Bg%;CMfE}?Fsxe#_u-B^zIV?(qY1<4HABW$ z(kF!IVXtOagaA`^Q@y)SxW5z`a7kG3F6JBX6E5O=e1~uGJ3hl{e1s42CH~^_?a8Da zJGdz0#E(c4n2VVmeMTR!0~{6N7ENtYz+yyY)r1s-3H=s=rZQt?2c*`jvqWnnN{YO%`Ly(`!gJ$Ulq;4pbi`&4`* zR?-zyTLmjtz=47O!PrprNIZ7De>grgc%oX+8&f$rADC6&DuePt;B(Ak1Z^CuaE7G$ zs(z=%r!+S@4Wg{6HLvdVYQAXy$na29^KNeNYFdB;pO#PDUd^oq9GbV$SKp}l>H
Tixzd8*|FrXJF_5ux2mgXi1cgh-SU9i*Ha~7JOu&ZM=(n*ot^?EjoP|P#) z2JHE>d#LnlK;Mxh-Zt*Jj&;TMIT&ewF`dg-ut=pumX_GJ`cJbb-2@TA{)2 z?7>LLar;LvLD5qn*%ddUhx9>vFvK3Lmmqu)@g<*RkwPcvaPNl;=L_d>bI-Nhv^MLh z>LY~2@%}H$3Uv+jeWZRHH26d8FbCMV3|p`dKj1rjg*DiNU08un@BtQJE?+S};|2Nh zn-=q9@}lTKBcdH`6=AelG@&73peIBP>Jyb{?KtA!b*x0a2^=LFY9aa0hy! z6CT0~SONpyL7Hu{U%*wBdx6Q#$_{;pRGU*{qXWszjgi50Hk%$El7{svw|l`SA6eVI zP6h_Oels=HKb#y)_m8ATF_I177`H{vQ~kY-Hy-8SA+QPs=)wmfoZgkf_C&pnG&1Q} zIxc_v{mK*FKJSDT0?bXAo5dlHU+|bMv*kjYSDwi^W$ugasE&4DYU|0L>ovJTA$tF` zDkWN}EG06m<+e;t`sD7^vDd44D!cPz97l!awaK9T`N~e47lYKwwFx>w_mpEgLFJVx zle+aL%${Wo+T#k@F>WF;f~Q35=u>84<7^8TZBVh9BAEX5HF8gxW)E8w|EO_gSv$O- vDn2u=%mZb8F+jQ5#%Y<*GJ60~5K7o~C>M6oDI*7Gi%m!9IxX^3^g#a$R|1mH