From b715149611d496dae57d4d4f3df8636bd4f0a0b9 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 19 Mar 2018 12:37:22 +0000
Subject: [PATCH] Fix up for the migration issues
---
.../funds/migrations/0029_add_reviewers.py | 36 -------------------
opentech/apply/review/admin.py | 3 --
.../migrations/0002_add_common_fields.py | 2 +-
opentech/apply/review/tests.py | 3 --
opentech/apply/users/models.py | 4 +--
5 files changed, 3 insertions(+), 45 deletions(-)
delete mode 100644 opentech/apply/funds/migrations/0029_add_reviewers.py
delete mode 100644 opentech/apply/review/admin.py
delete mode 100644 opentech/apply/review/tests.py
diff --git a/opentech/apply/funds/migrations/0029_add_reviewers.py b/opentech/apply/funds/migrations/0029_add_reviewers.py
deleted file mode 100644
index 2ec4d9631..000000000
--- a/opentech/apply/funds/migrations/0029_add_reviewers.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Generated by Django 2.0.2 on 2018-03-13 15:06
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('funds', '0028_update_on_delete_django2'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='applicationsubmission',
- name='reviewers',
- field=models.ManyToManyField(limit_choices_to={'groups__name__in': ['Staff', 'Reviewer']}, related_name='submissions_reviewer', to=settings.AUTH_USER_MODEL),
- ),
- migrations.AddField(
- model_name='fundtype',
- name='reviewers',
- field=models.ManyToManyField(limit_choices_to={'groups__name': 'Reviewer'}, related_name='fund_reviewers', to=settings.AUTH_USER_MODEL),
- ),
- migrations.AddField(
- model_name='round',
- name='reviewers',
- field=models.ManyToManyField(limit_choices_to={'groups__name': 'Reviewer'}, related_name='rounds_reviewer', to=settings.AUTH_USER_MODEL),
- ),
- migrations.AlterField(
- model_name='round',
- name='lead',
- field=models.ForeignKey(limit_choices_to={'groups__name': 'Staff'}, on_delete=django.db.models.deletion.PROTECT, related_name='round_lead', to=settings.AUTH_USER_MODEL),
- ),
- ]
diff --git a/opentech/apply/review/admin.py b/opentech/apply/review/admin.py
deleted file mode 100644
index 8c38f3f3d..000000000
--- a/opentech/apply/review/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/opentech/apply/review/migrations/0002_add_common_fields.py b/opentech/apply/review/migrations/0002_add_common_fields.py
index 6085335b9..f1c3bc8b7 100644
--- a/opentech/apply/review/migrations/0002_add_common_fields.py
+++ b/opentech/apply/review/migrations/0002_add_common_fields.py
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='review',
name='recommendation',
- field=models.IntegerField(choices=[(0, 'No'), (1, 'Yes'), (2, 'Maybe')], default=0, verbose_name='Recommendation'),
+ field=models.IntegerField(choices=[(0, 'No'), (1, 'Maybe'), (2, 'Yes')], default=0, verbose_name='Recommendation'),
),
migrations.AddField(
model_name='review',
diff --git a/opentech/apply/review/tests.py b/opentech/apply/review/tests.py
deleted file mode 100644
index 7ce503c2d..000000000
--- a/opentech/apply/review/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/opentech/apply/users/models.py b/opentech/apply/users/models.py
index a9377caf7..4980eafc1 100644
--- a/opentech/apply/users/models.py
+++ b/opentech/apply/users/models.py
@@ -14,7 +14,7 @@ class UserQuerySet(models.QuerySet):
return self.filter(groups__name=REVIEWER_GROUP_NAME)
-class UserManager(BaseUserManager):
+class UserManager(BaseUserManager.from_queryset(UserQuerySet)):
use_in_migrations = True
def _create_user(self, email, password, **extra_fields):
@@ -68,7 +68,7 @@ class User(AbstractUser):
first_name = None
last_name = None
- objects = UserManager.from_queryset(UserQuerySet)()
+ objects = UserManager()
def __str__(self):
return self.get_full_name() if self.get_full_name() else self.get_short_name()
--
GitLab