From 8ba7cf144f742c8f160f2478c92bd6148d706cd3 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 30 Jan 2019 15:54:00 +0000 Subject: [PATCH] Updated migrations to split the matman_roles group feature into matman, docman and groupman features. - Legacy-Id: 15919 --- .../0006_group_features_lists_to_jsonfield.py | 36 ++++++++++++---- .../0007_new_group_features_data.py | 42 ++++++++++++++++--- 2 files changed, 65 insertions(+), 13 deletions(-) diff --git a/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py b/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py index 5367fcc13..0cc82763e 100644 --- a/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py +++ b/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py @@ -14,10 +14,30 @@ class Migration(migrations.Migration): ] operations = [ + migrations.AddField( + model_name='groupfeatures', + name='docman_roles', + field=jsonfield.fields.JSONField(default=[b'ad', b'chair', b'delegate', b'secr'], max_length=128), + ), + migrations.AddField( + model_name='groupfeatures', + name='groupman_roles', + field=jsonfield.fields.JSONField(default=[b'ad', b'chair'], max_length=128), + ), + migrations.AddField( + model_name='historicalgroupfeatures', + name='docman_roles', + field=jsonfield.fields.JSONField(default=[b'ad', b'chair', b'delegate', b'secr'], max_length=128), + ), + migrations.AddField( + model_name='historicalgroupfeatures', + name='groupman_roles', + field=jsonfield.fields.JSONField(default=[b'ad', b'chair'], max_length=128), + ), migrations.AlterField( model_name='groupfeatures', name='admin_roles', - field=jsonfield.fields.JSONField(default=["chair"], max_length=64), + field=jsonfield.fields.JSONField(default=[b'chair'], max_length=64), ), migrations.AlterField( model_name='groupfeatures', @@ -37,22 +57,22 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='groupfeatures', name='material_types', - field=jsonfield.fields.JSONField(default=["slides"], max_length=64), + field=jsonfield.fields.JSONField(default=[b'slides'], max_length=64), ), migrations.AlterField( model_name='groupfeatures', name='matman_roles', - field=jsonfield.fields.JSONField(default=["ad","chair","delegate","secr"], max_length=128), + field=jsonfield.fields.JSONField(default=[b'ad', b'chair', b'delegate', b'secr'], max_length=128), ), migrations.AlterField( model_name='groupfeatures', name='role_order', - 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), + 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), ), migrations.AlterField( model_name='historicalgroupfeatures', name='admin_roles', - field=jsonfield.fields.JSONField(default=["chair"], max_length=64), + field=jsonfield.fields.JSONField(default=[b'chair'], max_length=64), ), migrations.AlterField( model_name='historicalgroupfeatures', @@ -72,16 +92,16 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='historicalgroupfeatures', name='material_types', - field=jsonfield.fields.JSONField(default=["slides"], max_length=64), + field=jsonfield.fields.JSONField(default=[b'slides'], max_length=64), ), migrations.AlterField( model_name='historicalgroupfeatures', name='matman_roles', - field=jsonfield.fields.JSONField(default=["ad","chair","delegate","secr"], max_length=128), + field=jsonfield.fields.JSONField(default=[b'ad', b'chair', b'delegate', b'secr'], max_length=128), ), migrations.AlterField( model_name='historicalgroupfeatures', name='role_order', - 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), + 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), ), ] diff --git a/ietf/group/migrations/0007_new_group_features_data.py b/ietf/group/migrations/0007_new_group_features_data.py index df9b3fbeb..b93e60041 100644 --- a/ietf/group/migrations/0007_new_group_features_data.py +++ b/ietf/group/migrations/0007_new_group_features_data.py @@ -17,6 +17,8 @@ group_type_features = { 'is_schedulable': True, 'req_subm_approval': True, 'show_on_agenda': True, + 'docman_roles': ['chair', 'delegate', 'secr'], + 'groupman_roles': ['ad', 'chair', 'delegate'], 'matman_roles': ['ad', 'chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr'], }, @@ -28,6 +30,8 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, + 'docman_roles': ['ad', 'delegate', 'secr'], + 'groupman_roles': ['ad',], 'matman_roles': ['ad', 'chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr'], }, @@ -39,6 +43,8 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, + 'docman_roles': [], + 'groupman_roles': ['ad', 'secr', ], 'matman_roles': ['ad', 'chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr'], }, @@ -50,6 +56,8 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, + 'docman_roles': ['secr'], + 'groupman_roles': ['ad', 'secr'], 'matman_roles': ['ad', 'secr'], 'role_order': ['chair', 'secr'], }, @@ -61,7 +69,9 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': True, - 'matman_roles': [], + 'docman_roles': ['chair'], + 'groupman_roles': [], + 'matman_roles': ['chair', 'delegate'], 'role_order': ['chair', 'secr'], }, u'ietf': { @@ -72,6 +82,8 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, + 'docman_roles': ['chair', ], + 'groupman_roles': ['chair', 'delegate'], 'matman_roles': ['chair', 'delegate'], 'role_order': ['chair', 'secr'], }, @@ -83,7 +95,9 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': False, 'show_on_agenda': False, - 'matman_roles': ['auth'], + 'docman_roles': ['auth'], + 'groupman_roles': [], + 'matman_roles': [], 'role_order': ['chair', 'secr'], }, u'irtf': { @@ -94,6 +108,8 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, + 'docman_roles': [], + 'groupman_roles': ['chair', 'delegate'], 'matman_roles': ['chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr'], }, @@ -105,6 +121,8 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, + 'docman_roles': [], + 'groupman_roles': ['chair', ], 'matman_roles': ['chair', 'secr'], 'role_order': ['chair', 'secr'], }, @@ -116,6 +134,8 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, + 'docman_roles': [], + 'groupman_roles': ['chair', 'advisor'], 'matman_roles': ['chair'], 'role_order': ['chair', 'member', 'advisor'], }, @@ -127,6 +147,8 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': False, 'show_on_agenda': False, + 'docman_roles': ['chair', 'secr'], + 'groupman_roles': ['chair', 'secr'], 'matman_roles': ['chair', 'secr'], 'role_order': ['chair', 'secr'], }, @@ -138,7 +160,9 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, - 'matman_roles': ['chair', 'secr'], + 'docman_roles': [], + 'groupman_roles': [], + 'matman_roles': [], 'role_order': ['chair', 'secr'], }, u'rg': { @@ -149,6 +173,8 @@ group_type_features = { 'is_schedulable': True, 'req_subm_approval': True, 'show_on_agenda': True, + 'docman_roles': ['chair', 'delegate', 'secr'], + 'groupman_roles': ['chair', 'secr'], 'matman_roles': ['chair', 'secr'], 'role_order': ['chair', 'secr'], }, @@ -160,7 +186,9 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': True, 'show_on_agenda': False, - 'matman_roles': ['liaiman', 'matman'], + 'docman_roles': ['liaiman', 'matman'], + 'groupman_roles': [], + 'matman_roles': [], 'role_order': ['liaiman'], }, u'team': { @@ -171,7 +199,9 @@ group_type_features = { 'is_schedulable': False, 'req_subm_approval': False, 'show_on_agenda': False, - 'matman_roles': ['chair', 'matman'], + 'docman_roles': [], + 'groupman_roles': ['chair', ], + 'matman_roles': [], 'role_order': ['chair', 'member', 'matman'], }, u'wg': { @@ -182,6 +212,8 @@ group_type_features = { 'is_schedulable': True, 'req_subm_approval': True, 'show_on_agenda': True, + 'docman_roles': ['chair', 'delegate', 'secr'], + 'groupman_roles': ['ad', 'chair', 'delegate', 'secr'], 'matman_roles': ['ad', 'chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr', 'delegate'], },