From 974d1c345a35900f0a8ac6062b223a4846873572 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 5 May 2020 13:54:46 +0200 Subject: [PATCH 04/10] misc: add missing blank=True to BooleanField in migrations (#42504) --- src/authentic2/a2_rbac/migrations/0001_initial.py | 2 +- .../a2_rbac/migrations/0006_auto_20150619_1056.py | 4 ++-- .../0015_organizationalunit_validate_emails.py | 2 +- .../0019_organizationalunit_show_username.py | 2 +- src/authentic2/migrations/0001_initial.py | 10 +++++----- src/authentic2/migrations/0016_attribute_disabled.py | 2 +- src/authentic2/migrations/0019_auto_20170309_1529.py | 2 +- src/authentic2/saml/migrations/0001_initial.py | 4 ++-- .../saml/migrations/0002_auto_20150320_1245.py | 2 +- src/authentic2_auth_oidc/migrations/0001_initial.py | 4 ++-- .../migrations/0003_oidcprovider_show.py | 2 +- .../migrations/0012_auto_20200122_2258.py | 2 +- ...organizationalunit_permission_role_roleparenting.py | 5 +++-- 13 files changed, 22 insertions(+), 21 deletions(-) diff --git src/authentic2/a2_rbac/migrations/0001_initial.py src/authentic2/a2_rbac/migrations/0001_initial.py index 3184065b..82d5808b 100644 --- src/authentic2/a2_rbac/migrations/0001_initial.py +++ src/authentic2/a2_rbac/migrations/0001_initial.py @@ -89,7 +89,7 @@ class Migration(migrations.Migration): name='RoleParenting', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('direct', models.BooleanField(default=True)), + ('direct', models.BooleanField(blank=True, default=True)), ('child', models.ForeignKey(related_name='parent_relation', to=settings.RBAC_ROLE_MODEL, on_delete=models.CASCADE)), ('parent', models.ForeignKey(related_name='child_relation', to=settings.RBAC_ROLE_MODEL, on_delete=models.CASCADE)), ], diff --git src/authentic2/a2_rbac/migrations/0006_auto_20150619_1056.py src/authentic2/a2_rbac/migrations/0006_auto_20150619_1056.py index ad8ac061..69092272 100644 --- src/authentic2/a2_rbac/migrations/0006_auto_20150619_1056.py +++ src/authentic2/a2_rbac/migrations/0006_auto_20150619_1056.py @@ -14,13 +14,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='organizationalunit', name='email_is_unique', - field=models.BooleanField(default=False, verbose_name='Email is unique'), + field=models.BooleanField(blank=True, default=False, verbose_name='Email is unique'), preserve_default=True, ), migrations.AddField( model_name='organizationalunit', name='username_is_unique', - field=models.BooleanField(default=False, verbose_name='Username is unique'), + field=models.BooleanField(blank=True, default=False, verbose_name='Username is unique'), preserve_default=True, ), ] diff --git src/authentic2/a2_rbac/migrations/0015_organizationalunit_validate_emails.py src/authentic2/a2_rbac/migrations/0015_organizationalunit_validate_emails.py index 66f14a4d..52fdcc90 100644 --- src/authentic2/a2_rbac/migrations/0015_organizationalunit_validate_emails.py +++ src/authentic2/a2_rbac/migrations/0015_organizationalunit_validate_emails.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='organizationalunit', name='validate_emails', - field=models.BooleanField(default=False, verbose_name='Validate emails'), + field=models.BooleanField(blank=True, default=False, verbose_name='Validate emails'), ), ] diff --git src/authentic2/a2_rbac/migrations/0019_organizationalunit_show_username.py src/authentic2/a2_rbac/migrations/0019_organizationalunit_show_username.py index f25152d7..8651a579 100644 --- src/authentic2/a2_rbac/migrations/0019_organizationalunit_show_username.py +++ src/authentic2/a2_rbac/migrations/0019_organizationalunit_show_username.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='organizationalunit', name='show_username', - field=models.BooleanField(default=True, verbose_name='Show username'), + field=models.BooleanField(blank=True, default=True, verbose_name='Show username'), ), ] diff --git src/authentic2/migrations/0001_initial.py src/authentic2/migrations/0001_initial.py index d6131cfd..3130cd8b 100644 --- src/authentic2/migrations/0001_initial.py +++ src/authentic2/migrations/0001_initial.py @@ -19,11 +19,11 @@ class Migration(migrations.Migration): ('label', models.CharField(unique=True, max_length=63, verbose_name='label')), ('description', models.TextField(verbose_name='description', blank=True)), ('name', models.SlugField(unique=True, max_length=256, verbose_name='name')), - ('required', models.BooleanField(default=False, verbose_name='required')), - ('asked_on_registration', models.BooleanField(default=False, verbose_name='asked on registration')), - ('user_editable', models.BooleanField(default=False, verbose_name='user editable')), - ('user_visible', models.BooleanField(default=False, verbose_name='user visible')), - ('multiple', models.BooleanField(default=False, verbose_name='multiple')), + ('required', models.BooleanField(blank=True, default=False, verbose_name='required')), + ('asked_on_registration', models.BooleanField(blank=True, default=False, verbose_name='asked on registration')), + ('user_editable', models.BooleanField(blank=True, default=False, verbose_name='user editable')), + ('user_visible', models.BooleanField(blank=True, default=False, verbose_name='user visible')), + ('multiple', models.BooleanField(blank=True, default=False, verbose_name='multiple')), ('kind', models.CharField(max_length=16, verbose_name='kind', choices=[('string', '')])), ], options={ diff --git src/authentic2/migrations/0016_attribute_disabled.py src/authentic2/migrations/0016_attribute_disabled.py index e92ec61c..53b2483d 100644 --- src/authentic2/migrations/0016_attribute_disabled.py +++ src/authentic2/migrations/0016_attribute_disabled.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='attribute', name='disabled', - field=models.BooleanField(default=False, verbose_name='disabled'), + field=models.BooleanField(blank=True, default=False, verbose_name='disabled'), ), ] diff --git src/authentic2/migrations/0019_auto_20170309_1529.py src/authentic2/migrations/0019_auto_20170309_1529.py index a3a23603..f2e22c91 100644 --- src/authentic2/migrations/0019_auto_20170309_1529.py +++ src/authentic2/migrations/0019_auto_20170309_1529.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='attribute', name='searchable', - field=models.BooleanField(default=False, verbose_name='searchable'), + field=models.BooleanField(blank=True, default=False, verbose_name='searchable'), ), migrations.AlterField( model_name='attributevalue', diff --git src/authentic2/saml/migrations/0001_initial.py src/authentic2/saml/migrations/0001_initial.py index 38e56eac..6760b392 100644 --- src/authentic2/saml/migrations/0001_initial.py +++ src/authentic2/saml/migrations/0001_initial.py @@ -127,7 +127,7 @@ class Migration(migrations.Migration): ('name_id_content', models.CharField(max_length=100, verbose_name='NameID')), ('name_id_qualifier', models.CharField(max_length=256, null=True, verbose_name='NameQualifier', blank=True)), ('name_id_sp_name_qualifier', models.CharField(max_length=256, null=True, verbose_name='SPNameQualifier', blank=True)), - ('termination_notified', models.BooleanField(default=False)), + ('termination_notified', models.BooleanField(blank=True, default=False)), ('creation', models.DateTimeField(auto_now_add=True)), ('last_modification', models.DateTimeField(auto_now=True)), ], @@ -262,7 +262,7 @@ class Migration(migrations.Migration): ('name', models.CharField(help_text='the local attribute name is used if left blank', max_length=128, verbose_name='name', blank=True)), ('friendly_name', models.CharField(max_length=64, verbose_name='friendly name', blank=True)), ('attribute_name', models.CharField(max_length=64, verbose_name='attribute name')), - ('enabled', models.BooleanField(default=True, verbose_name='enabled')), + ('enabled', models.BooleanField(blank=True, default=True, verbose_name='enabled')), ('content_type', models.ForeignKey(verbose_name='content type', to='contenttypes.ContentType', on_delete=models.CASCADE)), ], options={ diff --git src/authentic2/saml/migrations/0002_auto_20150320_1245.py src/authentic2/saml/migrations/0002_auto_20150320_1245.py index 1ead40b2..81f31748 100644 --- src/authentic2/saml/migrations/0002_auto_20150320_1245.py +++ src/authentic2/saml/migrations/0002_auto_20150320_1245.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='libertyserviceprovider', name='users_can_manage_federations', - field=models.BooleanField(default=True, db_index=True, verbose_name='users can manage federation'), + field=models.BooleanField(blank=True, default=True, db_index=True, verbose_name='users can manage federation'), preserve_default=True, ), migrations.AlterField( diff --git src/authentic2_auth_oidc/migrations/0001_initial.py src/authentic2_auth_oidc/migrations/0001_initial.py index e3774653..4869a59c 100644 --- src/authentic2_auth_oidc/migrations/0001_initial.py +++ src/authentic2_auth_oidc/migrations/0001_initial.py @@ -33,8 +33,8 @@ class Migration(migrations.Migration): ('claim', models.CharField(max_length=64, verbose_name='claim')), ('attribute', models.CharField(max_length=64, verbose_name='attribute')), ('verified', models.PositiveIntegerField(default=0, verbose_name='verified', choices=[(0, 'not verified'), (1, 'verified claim'), (2, 'always verified')])), - ('required', models.BooleanField(default=False, verbose_name='required')), - ('idtoken_claim', models.BooleanField(default=False, verbose_name='idtoken claim')), + ('required', models.BooleanField(blank=True, default=False, verbose_name='required')), + ('idtoken_claim', models.BooleanField(blank=True, default=False, verbose_name='idtoken claim')), ('created', models.DateTimeField(auto_now_add=True, verbose_name='created')), ('modified', models.DateTimeField(auto_now=True, verbose_name='modified')), ], diff --git src/authentic2_auth_oidc/migrations/0003_oidcprovider_show.py src/authentic2_auth_oidc/migrations/0003_oidcprovider_show.py index 050159ed..05862c86 100644 --- src/authentic2_auth_oidc/migrations/0003_oidcprovider_show.py +++ src/authentic2_auth_oidc/migrations/0003_oidcprovider_show.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='oidcprovider', name='show', - field=models.BooleanField(default=True, verbose_name='show on login page'), + field=models.BooleanField(blank=True, default=True, verbose_name='show on login page'), ), ] diff --git src/authentic2_idp_oidc/migrations/0012_auto_20200122_2258.py src/authentic2_idp_oidc/migrations/0012_auto_20200122_2258.py index c1d53ecc..ce3d446e 100644 --- src/authentic2_idp_oidc/migrations/0012_auto_20200122_2258.py +++ src/authentic2_idp_oidc/migrations/0012_auto_20200122_2258.py @@ -20,6 +20,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='oidcclient', name='scope', - field=models.TextField(blank=True, default='', verbose_name='resource owner credentials grant scope'), + field=models.TextField(blank=True, default='', help_text='Permitted or default scopes (for credentials grant)', verbose_name='resource owner credentials grant scope'), ), ] diff --git src/django_rbac/migrations/0002_organizationalunit_permission_role_roleparenting.py src/django_rbac/migrations/0002_organizationalunit_permission_role_roleparenting.py index 6a38c371..97f53d7c 100644 --- src/django_rbac/migrations/0002_organizationalunit_permission_role_roleparenting.py +++ src/django_rbac/migrations/0002_organizationalunit_permission_role_roleparenting.py @@ -2,9 +2,10 @@ from __future__ import unicode_literals from django.db import models, migrations -import authentic2.utils from django.conf import settings +import django_rbac + class Migration(migrations.Migration): @@ -74,7 +75,7 @@ class Migration(migrations.Migration): name='RoleParenting', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('direct', models.BooleanField(default=True)), + ('direct', models.BooleanField(blank=True, default=True)), ('child', models.ForeignKey(related_name='parent_relation', to=settings.RBAC_ROLE_MODEL, on_delete=models.CASCADE)), ('parent', models.ForeignKey(related_name='child_relation', to=settings.RBAC_ROLE_MODEL, on_delete=models.CASCADE)), ], -- 2.26.0