From 9e2dfbfe7fade7b7942aa3868f93c350a2aa1e23 Mon Sep 17 00:00:00 2001 From: Sasha Romijn Date: Fri, 22 Nov 2019 12:40:03 +0000 Subject: [PATCH] Fix review migration issue caused by merge - Legacy-Id: 17095 --- .../0020_add_request_assignment_next.py | 26 ------------- ...ueue_policy_and_request_assignment_next.py | 37 +++++++++++++++++++ ...eviewteamsettings_reviewer_queue_policy.py | 23 ------------ 3 files changed, 37 insertions(+), 49 deletions(-) delete mode 100644 ietf/review/migrations/0020_add_request_assignment_next.py create mode 100644 ietf/review/migrations/0021_reviewer_queue_policy_and_request_assignment_next.py delete mode 100644 ietf/review/migrations/0021_reviewteamsettings_reviewer_queue_policy.py diff --git a/ietf/review/migrations/0020_add_request_assignment_next.py b/ietf/review/migrations/0020_add_request_assignment_next.py deleted file mode 100644 index 9d61288aa..000000000 --- a/ietf/review/migrations/0020_add_request_assignment_next.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright The IETF Trust 2016-2019, All Rights Reserved -# -*- coding: utf-8 -*- -# Generated by Django 1.11.23 on 2019-11-18 04:26 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('review', '0019_auto_20191023_0829'), - ] - - operations = [ - migrations.AddField( - model_name='historicalreviewersettings', - name='request_assignment_next', - field=models.BooleanField(default=False, help_text='If you would like to be assigned to a review as soon as possible, select this option. It is automatically reset once you receive any assignment.', verbose_name='Select me next for an assignment'), - ), - migrations.AddField( - model_name='reviewersettings', - name='request_assignment_next', - field=models.BooleanField(default=False, help_text='If you would like to be assigned to a review as soon as possible, select this option. It is automatically reset once you receive any assignment.', verbose_name='Select me next for an assignment'), - ), - ] diff --git a/ietf/review/migrations/0021_reviewer_queue_policy_and_request_assignment_next.py b/ietf/review/migrations/0021_reviewer_queue_policy_and_request_assignment_next.py new file mode 100644 index 000000000..edaae51ae --- /dev/null +++ b/ietf/review/migrations/0021_reviewer_queue_policy_and_request_assignment_next.py @@ -0,0 +1,37 @@ +# Copyright The IETF Trust 2019, All Rights Reserved +# -*- coding: utf-8 -*- +# Generated by Django 1.11.23 on 2019-11-18 08:50 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('name', '0008_reviewerqueuepolicyname'), + ('review', '0020_auto_20191115_2059'), + ] + + operations = [ + migrations.AddField( + model_name='reviewteamsettings', + name='reviewer_queue_policy', + field=models.ForeignKey(default='RotateAlphabetically', on_delete=django.db.models.deletion.PROTECT, to='name.ReviewerQueuePolicyName'), + ), + migrations.AddField( + model_name='historicalreviewersettings', + name='request_assignment_next', + field=models.BooleanField(default=False, + help_text='If you would like to be assigned to a review as soon as possible, select this option. It is automatically reset once you receive any assignment.', + verbose_name='Select me next for an assignment'), + ), + migrations.AddField( + model_name='reviewersettings', + name='request_assignment_next', + field=models.BooleanField(default=False, + help_text='If you would like to be assigned to a review as soon as possible, select this option. It is automatically reset once you receive any assignment.', + verbose_name='Select me next for an assignment'), + ), + ] diff --git a/ietf/review/migrations/0021_reviewteamsettings_reviewer_queue_policy.py b/ietf/review/migrations/0021_reviewteamsettings_reviewer_queue_policy.py deleted file mode 100644 index d8d09fe74..000000000 --- a/ietf/review/migrations/0021_reviewteamsettings_reviewer_queue_policy.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright The IETF Trust 2019, All Rights Reserved -# -*- coding: utf-8 -*- -# Generated by Django 1.11.23 on 2019-11-18 08:50 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('name', '0008_reviewerqueuepolicyname'), - ('review', '0020_add_request_assignment_next'), - ] - - operations = [ - migrations.AddField( - model_name='reviewteamsettings', - name='reviewer_queue_policy', - field=models.ForeignKey(default='RotateAlphabetically', on_delete=django.db.models.deletion.PROTECT, to='name.ReviewerQueuePolicyName'), - ), - ]