From e4c4dc0a1b417761f58564d3f628ea1288868a38 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Thu, 7 Mar 2019 11:13:42 +0100
Subject: [PATCH] Updated migrations after rebase.
---
.../migrations/0015_partner_field_event.py | 18 ------------------
.../migrations/0019_partner_field_event.py | 18 ++++++++++++++++++
... => 0056_applicationsubmission_partners.py} | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
delete mode 100644 opentech/apply/activity/migrations/0015_partner_field_event.py
create mode 100644 opentech/apply/activity/migrations/0019_partner_field_event.py
rename opentech/apply/funds/migrations/{0051_applicationsubmission_partners.py => 0056_applicationsubmission_partners.py} (92%)
diff --git a/opentech/apply/activity/migrations/0015_partner_field_event.py b/opentech/apply/activity/migrations/0015_partner_field_event.py
deleted file mode 100644
index 0bc4c4b05..000000000
--- a/opentech/apply/activity/migrations/0015_partner_field_event.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.10 on 2019-02-20 12:40
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('activity', '0014_add_batch_reviewer_message'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='event',
- name='type',
- field=models.CharField(choices=[('UPDATE_LEAD', 'Update Lead'), ('EDIT', 'Edit'), ('APPLICANT_EDIT', 'Applicant Edit'), ('NEW_SUBMISSION', 'New Submission'), ('SCREENING', 'Screening'), ('TRANSITION', 'Transition'), ('DETERMINATION_OUTCOME', 'Determination Outcome'), ('INVITED_TO_PROPOSAL', 'Invited To Proposal'), ('REVIEWERS_UPDATED', 'Reviewers Updated'), ('BATCH_REVIEWERS_UPDATED', 'Batch Reviewers Updated'), ('PARTNERS_UPDATED', 'Partners Updated'), ('READY_FOR_REVIEW', 'Ready For Review'), ('NEW_REVIEW', 'New Review'), ('COMMENT', 'Comment'), ('PROPOSAL_SUBMITTED', 'Proposal Submitted'), ('OPENED_SEALED', 'Opened Sealed Submission')], max_length=50),
- ),
- ]
diff --git a/opentech/apply/activity/migrations/0019_partner_field_event.py b/opentech/apply/activity/migrations/0019_partner_field_event.py
new file mode 100644
index 000000000..65dd47e14
--- /dev/null
+++ b/opentech/apply/activity/migrations/0019_partner_field_event.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.10 on 2019-02-20 12:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('activity', '0018_add_batch_determine'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='event',
+ name='type',
+ field=models.CharField(choices=[('UPDATE_LEAD', 'Update Lead'), ('EDIT', 'Edit'), ('APPLICANT_EDIT', 'Applicant Edit'), ('NEW_SUBMISSION', 'New Submission'), ('SCREENING', 'Screening'), ('TRANSITION', 'Transition'), ('BATCH_TRANSITION', 'Batch Transition'), ('DETERMINATION_OUTCOME', 'Determination Outcome'), ('BATCH_DETERMINATION_OUTCOME', 'Batch Determination Outcome'), ('INVITED_TO_PROPOSAL', 'Invited To Proposal'), ('REVIEWERS_UPDATED', 'Reviewers Updated'), ('BATCH_REVIEWERS_UPDATED', 'Batch Reviewers Updated'), ('PARTNERS_UPDATED', 'Partners Updated'), ('READY_FOR_REVIEW', 'Ready For Review'), ('BATCH_READY_FOR_REVIEW', 'Batch Ready For Review'), ('NEW_REVIEW', 'New Review'), ('COMMENT', 'Comment'), ('PROPOSAL_SUBMITTED', 'Proposal Submitted'), ('OPENED_SEALED', 'Opened Sealed Submission'), ('REVIEW_OPINION', 'Review Opinion')], max_length=50),
+ ),
+ ]
diff --git a/opentech/apply/funds/migrations/0051_applicationsubmission_partners.py b/opentech/apply/funds/migrations/0056_applicationsubmission_partners.py
similarity index 92%
rename from opentech/apply/funds/migrations/0051_applicationsubmission_partners.py
rename to opentech/apply/funds/migrations/0056_applicationsubmission_partners.py
index b50d68de3..72a7105d8 100644
--- a/opentech/apply/funds/migrations/0051_applicationsubmission_partners.py
+++ b/opentech/apply/funds/migrations/0056_applicationsubmission_partners.py
@@ -8,7 +8,7 @@ class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('funds', '0050_roundsandlabs'),
+ ('funds', '0055_reviewers_rename'),
]
operations = [
--
GitLab