From d67b83464e9b4241281b0a5011ec9dce7a757dcb Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Tue, 13 Mar 2018 12:13:40 +0000
Subject: [PATCH] updates for django 2 post rebase
---
.../0004_update_on_delete_django2.py | 20 +++++++++++++++++++
opentech/apply/activity/models.py | 4 ++--
...te.py => 0028_update_on_delete_django2.py} | 14 +++++++++++--
opentech/apply/funds/models.py | 14 +++++++++++--
.../users/migrations/0004_django2_update.py | 18 -----------------
requirements.txt | 2 +-
6 files changed, 47 insertions(+), 25 deletions(-)
create mode 100644 opentech/apply/activity/migrations/0004_update_on_delete_django2.py
rename opentech/apply/funds/migrations/{0026_django2_update.py => 0028_update_on_delete_django2.py} (61%)
delete mode 100644 opentech/apply/users/migrations/0004_django2_update.py
diff --git a/opentech/apply/activity/migrations/0004_update_on_delete_django2.py b/opentech/apply/activity/migrations/0004_update_on_delete_django2.py
new file mode 100644
index 000000000..337cb2be2
--- /dev/null
+++ b/opentech/apply/activity/migrations/0004_update_on_delete_django2.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.0.2 on 2018-03-13 12:12
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('activity', '0003_activity_visibility'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='activity',
+ name='user',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/opentech/apply/activity/models.py b/opentech/apply/activity/models.py
index ece98c60b..253927595 100644
--- a/opentech/apply/activity/models.py
+++ b/opentech/apply/activity/models.py
@@ -52,8 +52,8 @@ class ActionManager(ActivityBaseManager):
class Activity(models.Model):
timestamp = models.DateTimeField(auto_now_add=True)
type = models.CharField(choices=ACTIVITY_TYPES.items(), max_length=30)
- user = models.ForeignKey(settings.AUTH_USER_MODEL)
- submission = models.ForeignKey('funds.ApplicationSubmission', related_name='activities')
+ user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
+ submission = models.ForeignKey('funds.ApplicationSubmission', related_name='activities', on_delete=models.CASCADE)
message = models.TextField()
visibility = models.CharField(choices=VISIBILITY.items(), default=PUBLIC, max_length=10)
diff --git a/opentech/apply/funds/migrations/0026_django2_update.py b/opentech/apply/funds/migrations/0028_update_on_delete_django2.py
similarity index 61%
rename from opentech/apply/funds/migrations/0026_django2_update.py
rename to opentech/apply/funds/migrations/0028_update_on_delete_django2.py
index 2f0241f47..1f3f45b75 100644
--- a/opentech/apply/funds/migrations/0026_django2_update.py
+++ b/opentech/apply/funds/migrations/0028_update_on_delete_django2.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.2 on 2018-03-01 21:46
+# Generated by Django 2.0.2 on 2018-03-13 12:12
from django.conf import settings
from django.db import migrations, models
@@ -8,10 +8,15 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('funds', '0025_update_with_file_blocks'),
+ ('funds', '0027_applicationsubmission_drupal_id'),
]
operations = [
+ migrations.AlterField(
+ model_name='applicationsubmission',
+ name='lead',
+ field=models.ForeignKey(limit_choices_to={'groups__name': 'Staff'}, on_delete=django.db.models.deletion.PROTECT, related_name='submission_lead', to=settings.AUTH_USER_MODEL),
+ ),
migrations.AlterField(
model_name='fundform',
name='form',
@@ -22,6 +27,11 @@ class Migration(migrations.Migration):
name='form',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='funds.ApplicationForm'),
),
+ migrations.AlterField(
+ model_name='labtype',
+ name='lead',
+ field=models.ForeignKey(limit_choices_to={'groups__name': 'Staff'}, on_delete=django.db.models.deletion.PROTECT, related_name='lab_lead', to=settings.AUTH_USER_MODEL),
+ ),
migrations.AlterField(
model_name='round',
name='lead',
diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py
index 1f2eb0d1c..a770504ce 100644
--- a/opentech/apply/funds/models.py
+++ b/opentech/apply/funds/models.py
@@ -386,7 +386,12 @@ class LabType(EmailForm, WorkflowStreamForm, SubmittableStreamForm): # type: ig
class Meta:
verbose_name = _("Lab")
- lead = models.ForeignKey(settings.AUTH_USER_MODEL, limit_choices_to={'groups__name': STAFF_GROUP_NAME}, related_name='lab_lead')
+ lead = models.ForeignKey(
+ settings.AUTH_USER_MODEL,
+ limit_choices_to={'groups__name': STAFF_GROUP_NAME},
+ related_name='lab_lead',
+ on_delete=models.PROTECT,
+ )
parent_page_types = ['apply_home.ApplyHomePage']
subpage_types = [] # type: ignore
@@ -468,7 +473,12 @@ class ApplicationSubmission(WorkflowHelpers, AbstractFormSubmission):
form_fields = StreamField(CustomFormFieldsBlock())
page = models.ForeignKey('wagtailcore.Page', on_delete=models.PROTECT)
round = models.ForeignKey('wagtailcore.Page', on_delete=models.PROTECT, related_name='submissions', null=True)
- lead = models.ForeignKey(settings.AUTH_USER_MODEL, limit_choices_to={'groups__name': STAFF_GROUP_NAME}, related_name='submission_lead')
+ lead = models.ForeignKey(
+ settings.AUTH_USER_MODEL,
+ limit_choices_to={'groups__name': STAFF_GROUP_NAME},
+ related_name='submission_lead',
+ on_delete=models.PROTECT,
+ )
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True)
search_data = models.TextField()
diff --git a/opentech/apply/users/migrations/0004_django2_update.py b/opentech/apply/users/migrations/0004_django2_update.py
deleted file mode 100644
index 8e03bee9e..000000000
--- a/opentech/apply/users/migrations/0004_django2_update.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.2 on 2018-03-01 21:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('users', '0003_make_email_username'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='user',
- name='last_name',
- field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
- ),
- ]
diff --git a/requirements.txt b/requirements.txt
index f7261ca4d..79fb5952c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ psycopg2==2.7.3.1
Pillow==4.3.0
django-bleach==0.3.0
django-extensions==2.0.0
-django-countries==5.12.0.0
+django-countries==5.1
Werkzeug==0.11.11
stellar==0.4.3
django-tinymce4-lite==1.7.0
--
GitLab