diff --git a/opentech/apply/funds/migrations/0013_fundtype_email_confirmation.py b/opentech/apply/funds/migrations/0013_fundtype_email_confirmation.py
deleted file mode 100644
index ed917b3c2e9a16308529421ec3cdf7efc72d029d..0000000000000000000000000000000000000000
--- a/opentech/apply/funds/migrations/0013_fundtype_email_confirmation.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.8 on 2018-01-25 10:16
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('funds', '0012_add_fullname_email_block_fields'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='fundtype',
- name='confirmation_text_extra',
- field=models.TextField(blank=True, help_text='Additional text for the application confirmation message.'),
- ),
- migrations.AddField(
- model_name='fundtype',
- name='from_address',
- field=models.CharField(blank=True, max_length=255, verbose_name='from address'),
- ),
- migrations.AddField(
- model_name='fundtype',
- name='subject',
- field=models.CharField(blank=True, max_length=255, verbose_name='subject'),
- ),
- migrations.AddField(
- model_name='fundtype',
- name='to_address',
- field=models.CharField(blank=True, help_text='Optional - form submissions will be emailed to these addresses. Separate multiple addresses by comma.', max_length=255, verbose_name='to address'),
- ),
- ]
diff --git a/opentech/apply/funds/migrations/00014_add_meta_names.py b/opentech/apply/funds/migrations/0014_add_meta_names.py
similarity index 100%
rename from opentech/apply/funds/migrations/00014_add_meta_names.py
rename to opentech/apply/funds/migrations/0014_add_meta_names.py
diff --git a/opentech/apply/funds/migrations/0014_applicationsubmission_user.py b/opentech/apply/funds/migrations/0014_applicationsubmission_user.py
deleted file mode 100644
index 5d643586df4f20d330b14d55db016d197e3db339..0000000000000000000000000000000000000000
--- a/opentech/apply/funds/migrations/0014_applicationsubmission_user.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.8 on 2018-01-25 14:22
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('funds', '0013_fundtype_email_confirmation'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='applicationsubmission',
- name='user',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
- preserve_default=False,
- ),
- ]
diff --git a/opentech/apply/funds/migrations/0012_add_fullname_email_block_fields.py b/opentech/apply/funds/migrations/0015_auto_20180201_1645.py
similarity index 76%
rename from opentech/apply/funds/migrations/0012_add_fullname_email_block_fields.py
rename to opentech/apply/funds/migrations/0015_auto_20180201_1645.py
index d8f1c3f898ee6d8388b812cfb9eec0603efd3db9..b71b0ab26574fa9b2200e0192f104cdfadbdc13f 100644
--- a/opentech/apply/funds/migrations/0012_add_fullname_email_block_fields.py
+++ b/opentech/apply/funds/migrations/0015_auto_20180201_1645.py
@@ -1,8 +1,10 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.8 on 2018-01-24 22:54
+# Generated by Django 1.11.8 on 2018-02-01 16:45
from __future__ import unicode_literals
-from django.db import migrations
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
import opentech.apply.categories.blocks
import wagtail.wagtailcore.blocks
import wagtail.wagtailcore.blocks.static_block
@@ -12,10 +14,56 @@ import wagtail.wagtailcore.fields
class Migration(migrations.Migration):
dependencies = [
- ('funds', '0011_update_encoder_add_round_to_submission'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('funds', '0014_add_meta_names'),
]
operations = [
+ migrations.AddField(
+ model_name='applicationsubmission',
+ name='user',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+ ),
+ migrations.AddField(
+ model_name='fundtype',
+ name='confirmation_text_extra',
+ field=models.TextField(blank=True, help_text='Additional text for the application confirmation message.'),
+ ),
+ migrations.AddField(
+ model_name='fundtype',
+ name='from_address',
+ field=models.CharField(blank=True, max_length=255, verbose_name='from address'),
+ ),
+ migrations.AddField(
+ model_name='fundtype',
+ name='subject',
+ field=models.CharField(blank=True, max_length=255, verbose_name='subject'),
+ ),
+ migrations.AddField(
+ model_name='fundtype',
+ name='to_address',
+ field=models.CharField(blank=True, help_text='Optional - form submissions will be emailed to these addresses. Separate multiple addresses by comma.', max_length=255, verbose_name='to address'),
+ ),
+ migrations.AddField(
+ model_name='labtype',
+ name='confirmation_text_extra',
+ field=models.TextField(blank=True, help_text='Additional text for the application confirmation message.'),
+ ),
+ migrations.AddField(
+ model_name='labtype',
+ name='from_address',
+ field=models.CharField(blank=True, max_length=255, verbose_name='from address'),
+ ),
+ migrations.AddField(
+ model_name='labtype',
+ name='subject',
+ field=models.CharField(blank=True, max_length=255, verbose_name='subject'),
+ ),
+ migrations.AddField(
+ model_name='labtype',
+ name='to_address',
+ field=models.CharField(blank=True, help_text='Optional - form submissions will be emailed to these addresses. Separate multiple addresses by comma.', max_length=255, verbose_name='to address'),
+ ),
migrations.AlterField(
model_name='applicationform',
name='form_fields',
diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py
index 7a2155a38fd4c03eebf9f241e88d69714cd8d740..d0fe66497868c663b469ebd3af0ea57bb037bb12 100644
--- a/opentech/apply/funds/models.py
+++ b/opentech/apply/funds/models.py
@@ -321,7 +321,7 @@ class JSONOrderable(models.QuerySet):
class ApplicationSubmission(AbstractFormSubmission):
form_data = JSONField(encoder=DjangoJSONEncoder)
round = models.ForeignKey('wagtailcore.Page', on_delete=models.CASCADE, related_name='submissions', null=True)
- user = models.ForeignKey(get_user_model(), on_delete=models.CASCADE)
+ user = models.ForeignKey(get_user_model(), on_delete=models.SET_NULL, null=True)
objects = JSONOrderable.as_manager()