Skip to content

Commit 9de2d49

Browse files
OleLaursenOleLaursen
committed
Fixup some of the migrations a bit upon the merge with trunk.
 - Legacy-Id: 12135
1 parent 60ec861 commit 9de2d49

3 files changed

Lines changed: 149 additions & 3 deletions

File tree

‎ietf/doc/migrations/0015_auto_20160927_0713.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
99
dependencies = [
1010
('name', '0015_insert_review_name_data'),
1111
('review', '0001_initial'),
12-
('doc', '0014_auto_20160824_2218'),
12+
('doc', '0014_auto_20160524_2147'),
1313
]
1414

1515
operations = [
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
2727
migrations.AlterField(
2828
model_name='docevent',
2929
name='type',
30-
field=models.CharField(max_length=50, choices=[(b'new_revision', b'Added new revision'), (b'changed_document', b'Changed document metadata'), (b'added_comment', b'Added comment'), (b'deleted', b'Deleted document'), (b'changed_state', b'Changed state'), (b'changed_stream', b'Changed document stream'), (b'expired_document', b'Expired document'), (b'extended_expiry', b'Extended expiry of document'), (b'requested_resurrect', b'Requested resurrect'), (b'completed_resurrect', b'Completed resurrect'), (b'changed_consensus', b'Changed consensus'), (b'published_rfc', b'Published RFC'), (b'added_suggested_replaces', b'Added suggested replacement relationships'), (b'reviewed_suggested_replaces', b'Reviewed suggested replacement relationships'), (b'changed_group', b'Changed group'), (b'changed_protocol_writeup', b'Changed protocol writeup'), (b'changed_charter_milestone', b'Changed charter milestone'), (b'initial_review', b'Set initial review time'), (b'changed_review_announcement', b'Changed WG Review text'), (b'changed_action_announcement', b'Changed WG Action text'), (b'started_iesg_process', b'Started IESG process on document'), (b'created_ballot', b'Created ballot'), (b'closed_ballot', b'Closed ballot'), (b'sent_ballot_announcement', b'Sent ballot announcement'), (b'changed_ballot_position', b'Changed ballot position'), (b'changed_ballot_approval_text', b'Changed ballot approval text'), (b'changed_ballot_writeup_text', b'Changed ballot writeup text'), (b'changed_rfc_editor_note_text', b'Changed RFC Editor Note text'), (b'changed_last_call_text', b'Changed last call text'), (b'requested_last_call', b'Requested last call'), (b'sent_last_call', b'Sent last call'), (b'scheduled_for_telechat', b'Scheduled for telechat'), (b'iesg_approved', b'IESG approved document (no problem)'), (b'iesg_disapproved', b'IESG disapproved document (do not publish)'), (b'approved_in_minute', b'Approved in minute'), (b'iana_review', b'IANA review comment'), (b'rfc_in_iana_registry', b'RFC is in IANA registry'), (b'rfc_editor_received_announcement', b'Announcement was received by RFC Editor'), (b'requested_publication', b'Publication at RFC Editor requested'), (b'sync_from_rfc_editor', b'Received updated information from RFC Editor'), (b'requested_review', b'Requested review'), (b'assigned_review_request', b'Assigned review request'), (b'closed_review_request', b'Closed review request')]),
30+
field=models.CharField(max_length=50, choices=[(b'new_revision', b'Added new revision'), (b'changed_document', b'Changed document metadata'), (b'added_comment', b'Added comment'), (b'added_message', b'Added message'), (b'deleted', b'Deleted document'), (b'changed_state', b'Changed state'), (b'changed_stream', b'Changed document stream'), (b'expired_document', b'Expired document'), (b'extended_expiry', b'Extended expiry of document'), (b'requested_resurrect', b'Requested resurrect'), (b'completed_resurrect', b'Completed resurrect'), (b'changed_consensus', b'Changed consensus'), (b'published_rfc', b'Published RFC'), (b'added_suggested_replaces', b'Added suggested replacement relationships'), (b'reviewed_suggested_replaces', b'Reviewed suggested replacement relationships'), (b'changed_group', b'Changed group'), (b'changed_protocol_writeup', b'Changed protocol writeup'), (b'changed_charter_milestone', b'Changed charter milestone'), (b'initial_review', b'Set initial review time'), (b'changed_review_announcement', b'Changed WG Review text'), (b'changed_action_announcement', b'Changed WG Action text'), (b'started_iesg_process', b'Started IESG process on document'), (b'created_ballot', b'Created ballot'), (b'closed_ballot', b'Closed ballot'), (b'sent_ballot_announcement', b'Sent ballot announcement'), (b'changed_ballot_position', b'Changed ballot position'), (b'changed_ballot_approval_text', b'Changed ballot approval text'), (b'changed_ballot_writeup_text', b'Changed ballot writeup text'), (b'changed_rfc_editor_note_text', b'Changed RFC Editor Note text'), (b'changed_last_call_text', b'Changed last call text'), (b'requested_last_call', b'Requested last call'), (b'sent_last_call', b'Sent last call'), (b'scheduled_for_telechat', b'Scheduled for telechat'), (b'iesg_approved', b'IESG approved document (no problem)'), (b'iesg_disapproved', b'IESG disapproved document (do not publish)'), (b'approved_in_minute', b'Approved in minute'), (b'iana_review', b'IANA review comment'), (b'rfc_in_iana_registry', b'RFC is in IANA registry'), (b'rfc_editor_received_announcement', b'Announcement was received by RFC Editor'), (b'requested_publication', b'Publication at RFC Editor requested'), (b'sync_from_rfc_editor', b'Received updated information from RFC Editor'), (b'requested_review', b'Requested review'), (b'assigned_review_request', b'Assigned review request'), (b'closed_review_request', b'Closed review request')]),
3131
preserve_default=True,
3232
),
3333
]

‎ietf/name/migrations/0016_auto_20161013_1010.py‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('name', '0015_insert_review_name_data'),
11+
]
12+
13+
operations = [
14+
migrations.AlterModelOptions(
15+
name='ballotpositionname',
16+
options={'ordering': ['order', 'name']},
17+
),
18+
migrations.AlterModelOptions(
19+
name='constraintname',
20+
options={'ordering': ['order', 'name']},
21+
),
22+
migrations.AlterModelOptions(
23+
name='dbtemplatetypename',
24+
options={'ordering': ['order', 'name']},
25+
),
26+
migrations.AlterModelOptions(
27+
name='docrelationshipname',
28+
options={'ordering': ['order', 'name']},
29+
),
30+
migrations.AlterModelOptions(
31+
name='docremindertypename',
32+
options={'ordering': ['order', 'name']},
33+
),
34+
migrations.AlterModelOptions(
35+
name='doctagname',
36+
options={'ordering': ['order', 'name']},
37+
),
38+
migrations.AlterModelOptions(
39+
name='doctypename',
40+
options={'ordering': ['order', 'name']},
41+
),
42+
migrations.AlterModelOptions(
43+
name='draftsubmissionstatename',
44+
options={'ordering': ['order', 'name']},
45+
),
46+
migrations.AlterModelOptions(
47+
name='feedbacktypename',
48+
options={'ordering': ['order', 'name']},
49+
),
50+
migrations.AlterModelOptions(
51+
name='groupmilestonestatename',
52+
options={'ordering': ['order', 'name']},
53+
),
54+
migrations.AlterModelOptions(
55+
name='groupstatename',
56+
options={'ordering': ['order', 'name']},
57+
),
58+
migrations.AlterModelOptions(
59+
name='grouptypename',
60+
options={'ordering': ['order', 'name']},
61+
),
62+
migrations.AlterModelOptions(
63+
name='intendedstdlevelname',
64+
options={'ordering': ['order', 'name']},
65+
),
66+
migrations.AlterModelOptions(
67+
name='iprdisclosurestatename',
68+
options={'ordering': ['order', 'name']},
69+
),
70+
migrations.AlterModelOptions(
71+
name='ipreventtypename',
72+
options={'ordering': ['order', 'name']},
73+
),
74+
migrations.AlterModelOptions(
75+
name='iprlicensetypename',
76+
options={'ordering': ['order', 'name']},
77+
),
78+
migrations.AlterModelOptions(
79+
name='liaisonstatementeventtypename',
80+
options={'ordering': ['order', 'name']},
81+
),
82+
migrations.AlterModelOptions(
83+
name='liaisonstatementpurposename',
84+
options={'ordering': ['order', 'name']},
85+
),
86+
migrations.AlterModelOptions(
87+
name='liaisonstatementstate',
88+
options={'ordering': ['order', 'name']},
89+
),
90+
migrations.AlterModelOptions(
91+
name='liaisonstatementtagname',
92+
options={'ordering': ['order', 'name']},
93+
),
94+
migrations.AlterModelOptions(
95+
name='meetingtypename',
96+
options={'ordering': ['order', 'name']},
97+
),
98+
migrations.AlterModelOptions(
99+
name='nomineepositionstatename',
100+
options={'ordering': ['order', 'name']},
101+
),
102+
migrations.AlterModelOptions(
103+
name='reviewrequeststatename',
104+
options={'ordering': ['order', 'name']},
105+
),
106+
migrations.AlterModelOptions(
107+
name='reviewresultname',
108+
options={'ordering': ['order', 'name']},
109+
),
110+
migrations.AlterModelOptions(
111+
name='reviewtypename',
112+
options={'ordering': ['order', 'name']},
113+
),
114+
migrations.AlterModelOptions(
115+
name='rolename',
116+
options={'ordering': ['order', 'name']},
117+
),
118+
migrations.AlterModelOptions(
119+
name='roomresourcename',
120+
options={'ordering': ['order', 'name']},
121+
),
122+
migrations.AlterModelOptions(
123+
name='sessionstatusname',
124+
options={'ordering': ['order', 'name']},
125+
),
126+
migrations.AlterModelOptions(
127+
name='stdlevelname',
128+
options={'ordering': ['order', 'name']},
129+
),
130+
migrations.AlterModelOptions(
131+
name='streamname',
132+
options={'ordering': ['order', 'name']},
133+
),
134+
migrations.AlterModelOptions(
135+
name='timeslottypename',
136+
options={'ordering': ['order', 'name']},
137+
),
138+
]

‎ietf/review/migrations/0001_initial.py‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ class Migration(migrations.Migration):
2323
('team', models.ForeignKey(to='group.Group')),
2424
],
2525
options={
26+
'verbose_name': 'next reviewer in team setting',
27+
'verbose_name_plural': 'next reviewer in team settings',
2628
},
2729
bases=(models.Model,),
2830
),
@@ -34,6 +36,8 @@ class Migration(migrations.Migration):
3436
('team', models.ForeignKey(to='group.Group')),
3537
],
3638
options={
39+
'verbose_name': 'review result used in team setting',
40+
'verbose_name_plural': 'review result used in team settings',
3741
},
3842
bases=(models.Model,),
3943
),
@@ -44,11 +48,12 @@ class Migration(migrations.Migration):
4448
('min_interval', models.IntegerField(default=30, verbose_name=b'Can review at most', choices=[(7, b'Once per week'), (14, b'Once per fortnight'), (30, b'Once per month'), (61, b'Once per two months'), (91, b'Once per quarter')])),
4549
('filter_re', models.CharField(help_text=b'Draft names matching regular expression should not be assigned', max_length=255, verbose_name=b'Filter regexp', blank=True)),
4650
('skip_next', models.IntegerField(default=0, verbose_name=b'Skip next assignments')),
47-
('remind_days_before_deadline', models.IntegerField(null=True, blank=True)),
51+
('remind_days_before_deadline', models.IntegerField(help_text=b"To get an email reminder in case you forget to do an assigned review, enter the number of days before a review deadline you want to receive it. Clear the field if you don't want a reminder.", null=True, blank=True)),
4852
('person', models.ForeignKey(to='person.Person')),
4953
('team', models.ForeignKey(to='group.Group')),
5054
],
5155
options={
56+
'verbose_name_plural': 'reviewer settings',
5257
},
5358
bases=(models.Model,),
5459
),
@@ -84,6 +89,7 @@ class Migration(migrations.Migration):
8489
('team', models.ForeignKey(to='group.Group')),
8590
],
8691
options={
92+
'verbose_name_plural': 'review wishes',
8793
},
8894
bases=(models.Model,),
8995
),
@@ -95,6 +101,8 @@ class Migration(migrations.Migration):
95101
('type', models.ForeignKey(to='name.ReviewTypeName')),
96102
],
97103
options={
104+
'verbose_name': 'review type used in team setting',
105+
'verbose_name_plural': 'review type used in team settings',
98106
},
99107
bases=(models.Model,),
100108
),

0 commit comments

Comments
 (0)