Skip to content
Snippets Groups Projects
Commit 38deb09f authored by Todd Dembrey's avatar Todd Dembrey
Browse files

Make reviewers optional

parent a81cfcb5
No related branches found
No related tags found
No related merge requests found
# 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),
),
]
...@@ -184,6 +184,8 @@ class FundType(EmailForm, WorkflowStreamForm): # type: ignore ...@@ -184,6 +184,8 @@ class FundType(EmailForm, WorkflowStreamForm): # type: ignore
settings.AUTH_USER_MODEL, settings.AUTH_USER_MODEL,
related_name='fund_reviewers', related_name='fund_reviewers',
limit_choices_to=LIMIT_TO_REVIEWERS, limit_choices_to=LIMIT_TO_REVIEWERS,
blank=True,
) )
parent_page_types = ['apply_home.ApplyHomePage'] parent_page_types = ['apply_home.ApplyHomePage']
...@@ -286,6 +288,7 @@ class Round(WorkflowStreamForm, SubmittableStreamForm): # type: ignore ...@@ -286,6 +288,7 @@ class Round(WorkflowStreamForm, SubmittableStreamForm): # type: ignore
settings.AUTH_USER_MODEL, settings.AUTH_USER_MODEL,
related_name='rounds_reviewer', related_name='rounds_reviewer',
limit_choices_to=LIMIT_TO_REVIEWERS, limit_choices_to=LIMIT_TO_REVIEWERS,
blank=True,
) )
start_date = models.DateField(default=date.today) start_date = models.DateField(default=date.today)
end_date = models.DateField( end_date = models.DateField(
...@@ -420,6 +423,7 @@ class LabType(EmailForm, WorkflowStreamForm, SubmittableStreamForm): # type: ig ...@@ -420,6 +423,7 @@ class LabType(EmailForm, WorkflowStreamForm, SubmittableStreamForm): # type: ig
settings.AUTH_USER_MODEL, settings.AUTH_USER_MODEL,
related_name='labs_reviewer', related_name='labs_reviewer',
limit_choices_to=LIMIT_TO_REVIEWERS, limit_choices_to=LIMIT_TO_REVIEWERS,
blank=True,
) )
parent_page_types = ['apply_home.ApplyHomePage'] parent_page_types = ['apply_home.ApplyHomePage']
...@@ -518,6 +522,7 @@ class ApplicationSubmission(WorkflowHelpers, BaseStreamForm, AbstractFormSubmiss ...@@ -518,6 +522,7 @@ class ApplicationSubmission(WorkflowHelpers, BaseStreamForm, AbstractFormSubmiss
settings.AUTH_USER_MODEL, settings.AUTH_USER_MODEL,
related_name='submissions_reviewer', related_name='submissions_reviewer',
limit_choices_to=LIMIT_TO_STAFF_AND_REVIEWERS, limit_choices_to=LIMIT_TO_STAFF_AND_REVIEWERS,
blank=True,
) )
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True) user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null=True)
search_data = models.TextField() search_data = models.TextField()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment