From 38deb09fb07be3a045d81a881b1e5ae584bc701c Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 19 Mar 2018 12:10:37 +0000
Subject: [PATCH] Make reviewers optional
---
...ake_reviewers_optional_in_all_instances.py | 35 +++++++++++++++++++
opentech/apply/funds/models.py | 5 +++
2 files changed, 40 insertions(+)
create mode 100644 opentech/apply/funds/migrations/0032_make_reviewers_optional_in_all_instances.py
diff --git a/opentech/apply/funds/migrations/0032_make_reviewers_optional_in_all_instances.py b/opentech/apply/funds/migrations/0032_make_reviewers_optional_in_all_instances.py
new file mode 100644
index 000000000..5e7088357
--- /dev/null
+++ b/opentech/apply/funds/migrations/0032_make_reviewers_optional_in_all_instances.py
@@ -0,0 +1,35 @@
+# Generated by Django 2.0.2 on 2018-03-19 12:09
+
+from django.conf import settings
+from django.db import migrations, models
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('funds', '0031_labtype_reviewers'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='applicationsubmission',
+ name='reviewers',
+ field=models.ManyToManyField(blank=True, limit_choices_to={'groups__name__in': ['Staff', 'Reviewer']}, related_name='submissions_reviewer', to=settings.AUTH_USER_MODEL),
+ ),
+ migrations.AlterField(
+ model_name='fundtype',
+ name='reviewers',
+ field=modelcluster.fields.ParentalManyToManyField(blank=True, limit_choices_to={'groups__name': 'Reviewer'}, related_name='fund_reviewers', to=settings.AUTH_USER_MODEL),
+ ),
+ migrations.AlterField(
+ model_name='labtype',
+ name='reviewers',
+ field=modelcluster.fields.ParentalManyToManyField(blank=True, limit_choices_to={'groups__name': 'Reviewer'}, related_name='labs_reviewer', to=settings.AUTH_USER_MODEL),
+ ),
+ migrations.AlterField(
+ model_name='round',
+ name='reviewers',
+ field=modelcluster.fields.ParentalManyToManyField(blank=True, limit_choices_to={'groups__name': 'Reviewer'}, related_name='rounds_reviewer', to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py
index a3f375eae..463fe834e 100644
--- a/opentech/apply/funds/models.py
+++ b/opentech/apply/funds/models.py
@@ -184,6 +184,8 @@ class FundType(EmailForm, WorkflowStreamForm): # type: ignore
settings.AUTH_USER_MODEL,
related_name='fund_reviewers',
limit_choices_to=LIMIT_TO_REVIEWERS,
+ blank=True,
+
)
parent_page_types = ['apply_home.ApplyHomePage']
@@ -286,6 +288,7 @@ class Round(WorkflowStreamForm, SubmittableStreamForm): # type: ignore
settings.AUTH_USER_MODEL,
related_name='rounds_reviewer',
limit_choices_to=LIMIT_TO_REVIEWERS,
+ blank=True,
)
start_date = models.DateField(default=date.today)
end_date = models.DateField(
@@ -420,6 +423,7 @@ class LabType(EmailForm, WorkflowStreamForm, SubmittableStreamForm): # type: ig
settings.AUTH_USER_MODEL,
related_name='labs_reviewer',
limit_choices_to=LIMIT_TO_REVIEWERS,
+ blank=True,
)
parent_page_types = ['apply_home.ApplyHomePage']
@@ -518,6 +522,7 @@ class ApplicationSubmission(WorkflowHelpers, BaseStreamForm, AbstractFormSubmiss
settings.AUTH_USER_MODEL,
related_name='submissions_reviewer',
limit_choices_to=LIMIT_TO_STAFF_AND_REVIEWERS,
+ blank=True,
)
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True)
search_data = models.TextField()
--
GitLab