diff --git a/opentech/apply/funds/blocks.py b/opentech/apply/funds/blocks.py index 11b0fc31d7a0c1a3a894758cdd32790034b1dc4c..770c321c26e15c2cea647c5a68b689fd2b68d87f 100644 --- a/opentech/apply/funds/blocks.py +++ b/opentech/apply/funds/blocks.py @@ -109,7 +109,7 @@ class MustIncludeStatic(StaticBlock): super().__init__(*args, **kwargs) class Meta: - admin_text = 'Much be included in the form only once.' + admin_text = 'Must be included in the form only once.' def render_form(self, *args, **kwargs): errors = kwargs.pop('errors') diff --git a/opentech/apply/funds/migrations/0019_protect_submission.py b/opentech/apply/funds/migrations/0019_protect_submission.py new file mode 100644 index 0000000000000000000000000000000000000000..d9669d25aa7c7c4d9cf6e598ad49aab1bf987c10 --- /dev/null +++ b/opentech/apply/funds/migrations/0019_protect_submission.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.8 on 2018-02-08 15:52 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('funds', '0018_add_addressfield'), + ] + + operations = [ + migrations.AlterField( + model_name='applicationsubmission', + name='page', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='wagtailcore.Page'), + ), + migrations.AlterField( + model_name='applicationsubmission', + name='round', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='submissions', to='wagtailcore.Page'), + ), + ] diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py index 540557662a44cb25f584d7cbe241e3d450efae03..2b2b7833b703650237f1941fdb645713ef68f0f0 100644 --- a/opentech/apply/funds/models.py +++ b/opentech/apply/funds/models.py @@ -414,7 +414,8 @@ 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) + page = models.ForeignKey('wagtailcore.Page', on_delete=models.PROTECT) + round = models.ForeignKey('wagtailcore.Page', on_delete=models.PROTECT, related_name='submissions', null=True) user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True) objects = JSONOrderable.as_manager() diff --git a/opentech/public/projects/models.py b/opentech/public/projects/models.py index e43e777546664b7a06b8895fe327463240bbd3a2..a2db7f62eb3eddeb47c35ccc77f7de61bce3224f 100644 --- a/opentech/public/projects/models.py +++ b/opentech/public/projects/models.py @@ -140,7 +140,7 @@ class ProjectPage(FundingMixin, BasePage): class ProjectIndexPage(BasePage): subpage_types = ['ProjectPage'] - parent_page_types = ['home.Homepage'] + parent_page_types = ['home.Homepage', 'standardpages.IndexPage'] introduction = models.TextField(blank=True)