Skip to content

Commit d1f1be5

Browse files
committed
Second correction to the default values of the GroupFeatures JSONField fields, and updated the migration to match.
- Legacy-Id: 15915
1 parent 6590e4f commit d1f1be5

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

ietf/group/migrations/0006_group_features_lists_to_jsonfield.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
1717
migrations.AlterField(
1818
model_name='groupfeatures',
1919
name='admin_roles',
20-
field=jsonfield.fields.JSONField(default=b'["chair"]', max_length=64),
20+
field=jsonfield.fields.JSONField(default=["chair"], max_length=64),
2121
),
2222
migrations.AlterField(
2323
model_name='groupfeatures',
@@ -37,22 +37,22 @@ class Migration(migrations.Migration):
3737
migrations.AlterField(
3838
model_name='groupfeatures',
3939
name='material_types',
40-
field=jsonfield.fields.JSONField(default=b'["slides"]', max_length=64),
40+
field=jsonfield.fields.JSONField(default=["slides"], max_length=64),
4141
),
4242
migrations.AlterField(
4343
model_name='groupfeatures',
4444
name='matman_roles',
45-
field=jsonfield.fields.JSONField(default=b'["ad","chair","delegate","secr"]', max_length=128),
45+
field=jsonfield.fields.JSONField(default=["ad","chair","delegate","secr"], max_length=128),
4646
),
4747
migrations.AlterField(
4848
model_name='groupfeatures',
4949
name='role_order',
50-
field=jsonfield.fields.JSONField(default=b'["chair","secr","member"]', help_text=b'The order in which roles are shown, for instance on photo pages. Enter valid JSON.', max_length=128),
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),
5151
),
5252
migrations.AlterField(
5353
model_name='historicalgroupfeatures',
5454
name='admin_roles',
55-
field=jsonfield.fields.JSONField(default=b'["chair"]', max_length=64),
55+
field=jsonfield.fields.JSONField(default=["chair"], max_length=64),
5656
),
5757
migrations.AlterField(
5858
model_name='historicalgroupfeatures',
@@ -72,16 +72,16 @@ class Migration(migrations.Migration):
7272
migrations.AlterField(
7373
model_name='historicalgroupfeatures',
7474
name='material_types',
75-
field=jsonfield.fields.JSONField(default=b'["slides"]', max_length=64),
75+
field=jsonfield.fields.JSONField(default=["slides"], max_length=64),
7676
),
7777
migrations.AlterField(
7878
model_name='historicalgroupfeatures',
7979
name='matman_roles',
80-
field=jsonfield.fields.JSONField(default=b'["ad","chair","delegate","secr"]', max_length=128),
80+
field=jsonfield.fields.JSONField(default=["ad","chair","delegate","secr"], max_length=128),
8181
),
8282
migrations.AlterField(
8383
model_name='historicalgroupfeatures',
8484
name='role_order',
85-
field=jsonfield.fields.JSONField(default=b'["chair","secr","member"]', help_text=b'The order in which roles are shown, for instance on photo pages. Enter valid JSON.', max_length=128),
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),
8686
),
8787
]

ietf/group/models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ class GroupFeatures(models.Model):
229229
agenda_type = models.ForeignKey(AgendaTypeName, null=True, default="ietf", on_delete=CASCADE)
230230
about_page = models.CharField(max_length=64, blank=False, default="ietf.group.views.group_about" )
231231
default_tab = models.CharField(max_length=64, blank=False, default="ietf.group.views.group_about" )
232-
material_types = jsonfield.JSONField(max_length=64, blank=False, default='["slides"]')
233-
admin_roles = jsonfield.JSONField(max_length=64, blank=False, default='["chair"]')
234-
matman_roles = jsonfield.JSONField(max_length=128, blank=False, default='["ad","chair","delegate","secr"]')
235-
role_order = jsonfield.JSONField(max_length=128, blank=False, default='["chair","secr","member"]',
232+
material_types = jsonfield.JSONField(max_length=64, blank=False, default=["slides"])
233+
admin_roles = jsonfield.JSONField(max_length=64, blank=False, default=["chair"])
234+
matman_roles = jsonfield.JSONField(max_length=128, blank=False, default=["ad","chair","delegate","secr"])
235+
role_order = jsonfield.JSONField(max_length=128, blank=False, default=["chair","secr","member"],
236236
help_text="The order in which roles are shown, for instance on photo pages. Enter valid JSON.")
237237

238238

0 commit comments

Comments
 (0)