Skip to content

Commit 8ba7cf1

Browse files
committed
Updated migrations to split the matman_roles group feature into matman, docman and groupman features.
- Legacy-Id: 15919
1 parent 5d88a08 commit 8ba7cf1

2 files changed

Lines changed: 65 additions & 13 deletions

File tree

ietf/group/migrations/0006_group_features_lists_to_jsonfield.py

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,30 @@ class Migration(migrations.Migration):
1414
]
1515

1616
operations = [
17+
migrations.AddField(
18+
model_name='groupfeatures',
19+
name='docman_roles',
20+
field=jsonfield.fields.JSONField(default=[b'ad', b'chair', b'delegate', b'secr'], max_length=128),
21+
),
22+
migrations.AddField(
23+
model_name='groupfeatures',
24+
name='groupman_roles',
25+
field=jsonfield.fields.JSONField(default=[b'ad', b'chair'], max_length=128),
26+
),
27+
migrations.AddField(
28+
model_name='historicalgroupfeatures',
29+
name='docman_roles',
30+
field=jsonfield.fields.JSONField(default=[b'ad', b'chair', b'delegate', b'secr'], max_length=128),
31+
),
32+
migrations.AddField(
33+
model_name='historicalgroupfeatures',
34+
name='groupman_roles',
35+
field=jsonfield.fields.JSONField(default=[b'ad', b'chair'], max_length=128),
36+
),
1737
migrations.AlterField(
1838
model_name='groupfeatures',
1939
name='admin_roles',
20-
field=jsonfield.fields.JSONField(default=["chair"], max_length=64),
40+
field=jsonfield.fields.JSONField(default=[b'chair'], max_length=64),
2141
),
2242
migrations.AlterField(
2343
model_name='groupfeatures',
@@ -37,22 +57,22 @@ class Migration(migrations.Migration):
3757
migrations.AlterField(
3858
model_name='groupfeatures',
3959
name='material_types',
40-
field=jsonfield.fields.JSONField(default=["slides"], max_length=64),
60+
field=jsonfield.fields.JSONField(default=[b'slides'], max_length=64),
4161
),
4262
migrations.AlterField(
4363
model_name='groupfeatures',
4464
name='matman_roles',
45-
field=jsonfield.fields.JSONField(default=["ad","chair","delegate","secr"], max_length=128),
65+
field=jsonfield.fields.JSONField(default=[b'ad', b'chair', b'delegate', b'secr'], max_length=128),
4666
),
4767
migrations.AlterField(
4868
model_name='groupfeatures',
4969
name='role_order',
50-
field=jsonfield.fields.JSONField(default=["chair","secr","member"], help_text=b'The order in which roles are shown, for instance on photo pages. Enter valid JSON.', max_length=128),
70+
field=jsonfield.fields.JSONField(default=[b'chair', b'secr', b'member'], help_text=b'The order in which roles are shown, for instance on photo pages. Enter valid JSON.', max_length=128),
5171
),
5272
migrations.AlterField(
5373
model_name='historicalgroupfeatures',
5474
name='admin_roles',
55-
field=jsonfield.fields.JSONField(default=["chair"], max_length=64),
75+
field=jsonfield.fields.JSONField(default=[b'chair'], max_length=64),
5676
),
5777
migrations.AlterField(
5878
model_name='historicalgroupfeatures',
@@ -72,16 +92,16 @@ class Migration(migrations.Migration):
7292
migrations.AlterField(
7393
model_name='historicalgroupfeatures',
7494
name='material_types',
75-
field=jsonfield.fields.JSONField(default=["slides"], max_length=64),
95+
field=jsonfield.fields.JSONField(default=[b'slides'], max_length=64),
7696
),
7797
migrations.AlterField(
7898
model_name='historicalgroupfeatures',
7999
name='matman_roles',
80-
field=jsonfield.fields.JSONField(default=["ad","chair","delegate","secr"], max_length=128),
100+
field=jsonfield.fields.JSONField(default=[b'ad', b'chair', b'delegate', b'secr'], max_length=128),
81101
),
82102
migrations.AlterField(
83103
model_name='historicalgroupfeatures',
84104
name='role_order',
85-
field=jsonfield.fields.JSONField(default=["chair","secr","member"], help_text=b'The order in which roles are shown, for instance on photo pages. Enter valid JSON.', max_length=128),
105+
field=jsonfield.fields.JSONField(default=[b'chair', b'secr', b'member'], help_text=b'The order in which roles are shown, for instance on photo pages. Enter valid JSON.', max_length=128),
86106
),
87107
]

ietf/group/migrations/0007_new_group_features_data.py

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
'is_schedulable': True,
1818
'req_subm_approval': True,
1919
'show_on_agenda': True,
20+
'docman_roles': ['chair', 'delegate', 'secr'],
21+
'groupman_roles': ['ad', 'chair', 'delegate'],
2022
'matman_roles': ['ad', 'chair', 'delegate', 'secr'],
2123
'role_order': ['chair', 'secr'],
2224
},
@@ -28,6 +30,8 @@
2830
'is_schedulable': False,
2931
'req_subm_approval': True,
3032
'show_on_agenda': False,
33+
'docman_roles': ['ad', 'delegate', 'secr'],
34+
'groupman_roles': ['ad',],
3135
'matman_roles': ['ad', 'chair', 'delegate', 'secr'],
3236
'role_order': ['chair', 'secr'],
3337
},
@@ -39,6 +43,8 @@
3943
'is_schedulable': False,
4044
'req_subm_approval': True,
4145
'show_on_agenda': False,
46+
'docman_roles': [],
47+
'groupman_roles': ['ad', 'secr', ],
4248
'matman_roles': ['ad', 'chair', 'delegate', 'secr'],
4349
'role_order': ['chair', 'secr'],
4450
},
@@ -50,6 +56,8 @@
5056
'is_schedulable': False,
5157
'req_subm_approval': True,
5258
'show_on_agenda': False,
59+
'docman_roles': ['secr'],
60+
'groupman_roles': ['ad', 'secr'],
5361
'matman_roles': ['ad', 'secr'],
5462
'role_order': ['chair', 'secr'],
5563
},
@@ -61,7 +69,9 @@
6169
'is_schedulable': False,
6270
'req_subm_approval': True,
6371
'show_on_agenda': True,
64-
'matman_roles': [],
72+
'docman_roles': ['chair'],
73+
'groupman_roles': [],
74+
'matman_roles': ['chair', 'delegate'],
6575
'role_order': ['chair', 'secr'],
6676
},
6777
u'ietf': {
@@ -72,6 +82,8 @@
7282
'is_schedulable': False,
7383
'req_subm_approval': True,
7484
'show_on_agenda': False,
85+
'docman_roles': ['chair', ],
86+
'groupman_roles': ['chair', 'delegate'],
7587
'matman_roles': ['chair', 'delegate'],
7688
'role_order': ['chair', 'secr'],
7789
},
@@ -83,7 +95,9 @@
8395
'is_schedulable': False,
8496
'req_subm_approval': False,
8597
'show_on_agenda': False,
86-
'matman_roles': ['auth'],
98+
'docman_roles': ['auth'],
99+
'groupman_roles': [],
100+
'matman_roles': [],
87101
'role_order': ['chair', 'secr'],
88102
},
89103
u'irtf': {
@@ -94,6 +108,8 @@
94108
'is_schedulable': False,
95109
'req_subm_approval': True,
96110
'show_on_agenda': False,
111+
'docman_roles': [],
112+
'groupman_roles': ['chair', 'delegate'],
97113
'matman_roles': ['chair', 'delegate', 'secr'],
98114
'role_order': ['chair', 'secr'],
99115
},
@@ -105,6 +121,8 @@
105121
'is_schedulable': False,
106122
'req_subm_approval': True,
107123
'show_on_agenda': False,
124+
'docman_roles': [],
125+
'groupman_roles': ['chair', ],
108126
'matman_roles': ['chair', 'secr'],
109127
'role_order': ['chair', 'secr'],
110128
},
@@ -116,6 +134,8 @@
116134
'is_schedulable': False,
117135
'req_subm_approval': True,
118136
'show_on_agenda': False,
137+
'docman_roles': [],
138+
'groupman_roles': ['chair', 'advisor'],
119139
'matman_roles': ['chair'],
120140
'role_order': ['chair', 'member', 'advisor'],
121141
},
@@ -127,6 +147,8 @@
127147
'is_schedulable': False,
128148
'req_subm_approval': False,
129149
'show_on_agenda': False,
150+
'docman_roles': ['chair', 'secr'],
151+
'groupman_roles': ['chair', 'secr'],
130152
'matman_roles': ['chair', 'secr'],
131153
'role_order': ['chair', 'secr'],
132154
},
@@ -138,7 +160,9 @@
138160
'is_schedulable': False,
139161
'req_subm_approval': True,
140162
'show_on_agenda': False,
141-
'matman_roles': ['chair', 'secr'],
163+
'docman_roles': [],
164+
'groupman_roles': [],
165+
'matman_roles': [],
142166
'role_order': ['chair', 'secr'],
143167
},
144168
u'rg': {
@@ -149,6 +173,8 @@
149173
'is_schedulable': True,
150174
'req_subm_approval': True,
151175
'show_on_agenda': True,
176+
'docman_roles': ['chair', 'delegate', 'secr'],
177+
'groupman_roles': ['chair', 'secr'],
152178
'matman_roles': ['chair', 'secr'],
153179
'role_order': ['chair', 'secr'],
154180
},
@@ -160,7 +186,9 @@
160186
'is_schedulable': False,
161187
'req_subm_approval': True,
162188
'show_on_agenda': False,
163-
'matman_roles': ['liaiman', 'matman'],
189+
'docman_roles': ['liaiman', 'matman'],
190+
'groupman_roles': [],
191+
'matman_roles': [],
164192
'role_order': ['liaiman'],
165193
},
166194
u'team': {
@@ -171,7 +199,9 @@
171199
'is_schedulable': False,
172200
'req_subm_approval': False,
173201
'show_on_agenda': False,
174-
'matman_roles': ['chair', 'matman'],
202+
'docman_roles': [],
203+
'groupman_roles': ['chair', ],
204+
'matman_roles': [],
175205
'role_order': ['chair', 'member', 'matman'],
176206
},
177207
u'wg': {
@@ -182,6 +212,8 @@
182212
'is_schedulable': True,
183213
'req_subm_approval': True,
184214
'show_on_agenda': True,
215+
'docman_roles': ['chair', 'delegate', 'secr'],
216+
'groupman_roles': ['ad', 'chair', 'delegate', 'secr'],
185217
'matman_roles': ['ad', 'chair', 'delegate', 'secr'],
186218
'role_order': ['chair', 'secr', 'delegate'],
187219
},

0 commit comments

Comments
 (0)