From 564ad19e136d43bcab8b5d5d6b630078b7c3f218 Mon Sep 17 00:00:00 2001 From: Joel Falknau Date: Wed, 5 Mar 2025 12:21:24 +1000 Subject: [PATCH] change this null back, not ideal, but its how it works --- .../autogroups/migrations/0001_initial.py | 14 +++++++++++--- ...18_alter_evecharacter_alliance_name_and_more.py | 11 +++-------- allianceauth/eveonline/migrations/0019_v5squash.py | 8 ++++---- allianceauth/eveonline/models.py | 6 +++--- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/allianceauth/eveonline/autogroups/migrations/0001_initial.py b/allianceauth/eveonline/autogroups/migrations/0001_initial.py index 077eb1cd..fc62cad5 100644 --- a/allianceauth/eveonline/autogroups/migrations/0001_initial.py +++ b/allianceauth/eveonline/autogroups/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.1.6 on 2025-03-05 01:45 +# Generated by Django 5.1.6 on 2025-03-05 02:08 import django.db.models.deletion from django.conf import settings @@ -28,8 +28,6 @@ class Migration(migrations.Migration): ('alliance_name_source', models.CharField(choices=[('ticker', 'Ticker'), ('name', 'Full name')], default='name', max_length=20)), ('replace_spaces', models.BooleanField(default=False)), ('replace_spaces_with', models.CharField(blank=True, default='', help_text='Any spaces in the group name will be replaced with this.', max_length=10)), - ('alliance_managed_groups', models.ManyToManyField(help_text="A list of alliance groups created and maintained by this AutogroupConfig. You should not edit this list unless you know what you're doing.", related_name='alliance_managed_config', through='eve_autogroups.ManagedAllianceGroup', to='auth.group')), - ('corp_managed_groups', models.ManyToManyField(help_text="A list of corporation groups created and maintained by this AutogroupConfig. You should not edit this list unless you know what you're doing.", related_name='corp_managed_config', through='eve_autogroups.ManagedCorpGroup', to='auth.group')), ('states', models.ManyToManyField(related_name='autogroups', to='authentication.state')), ], ), @@ -45,6 +43,11 @@ class Migration(migrations.Migration): 'abstract': False, }, ), + migrations.AddField( + model_name='autogroupsconfig', + name='alliance_managed_groups', + field=models.ManyToManyField(help_text="A list of alliance groups created and maintained by this AutogroupConfig. You should not edit this list unless you know what you're doing.", related_name='alliance_managed_config', through='eve_autogroups.ManagedAllianceGroup', to='auth.group'), + ), migrations.CreateModel( name='ManagedCorpGroup', fields=[ @@ -57,4 +60,9 @@ class Migration(migrations.Migration): 'abstract': False, }, ), + migrations.AddField( + model_name='autogroupsconfig', + name='corp_managed_groups', + field=models.ManyToManyField(help_text="A list of corporation groups created and maintained by this AutogroupConfig. You should not edit this list unless you know what you're doing.", related_name='corp_managed_config', through='eve_autogroups.ManagedCorpGroup', to='auth.group'), + ), ] diff --git a/allianceauth/eveonline/migrations/0018_alter_evecharacter_alliance_name_and_more.py b/allianceauth/eveonline/migrations/0018_alter_evecharacter_alliance_name_and_more.py index d2fe0c0b..73d5a94c 100644 --- a/allianceauth/eveonline/migrations/0018_alter_evecharacter_alliance_name_and_more.py +++ b/allianceauth/eveonline/migrations/0018_alter_evecharacter_alliance_name_and_more.py @@ -13,21 +13,16 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='evecharacter', name='alliance_name', - field=models.CharField(blank=True, default='', max_length=254), + field=models.CharField(blank=True, default='', max_length=254, null=True), ), migrations.AlterField( model_name='evecharacter', name='alliance_ticker', - field=models.CharField(blank=True, default='', max_length=5), + field=models.CharField(blank=True, default='', max_length=5, null=True), ), migrations.AlterField( model_name='evecharacter', name='faction_name', - field=models.CharField(blank=True, default='', max_length=254), - ), - migrations.AlterField( - model_name='evecharacter', - name='faction_id', - field=models.PositiveIntegerField(blank=True, default=None, null=True), + field=models.CharField(blank=True, default='', max_length=254, null=True), ), ] diff --git a/allianceauth/eveonline/migrations/0019_v5squash.py b/allianceauth/eveonline/migrations/0019_v5squash.py index 41c3f7bc..88bf42e9 100644 --- a/allianceauth/eveonline/migrations/0019_v5squash.py +++ b/allianceauth/eveonline/migrations/0019_v5squash.py @@ -1,4 +1,4 @@ -# Generated by Django 5.1.6 on 2025-03-05 01:03 +# Generated by Django 5.1.6 on 2025-03-05 02:19 import django.db.models.deletion from django.db import migrations, models @@ -61,10 +61,10 @@ class Migration(migrations.Migration): ('corporation_name', models.CharField(max_length=254)), ('corporation_ticker', models.CharField(max_length=5)), ('alliance_id', models.PositiveIntegerField(blank=True, default=None, null=True)), - ('alliance_name', models.CharField(blank=True, default='', max_length=254)), - ('alliance_ticker', models.CharField(blank=True, default='', max_length=5)), + ('alliance_name', models.CharField(blank=True, default='', max_length=254, null=True)), + ('alliance_ticker', models.CharField(blank=True, default='', max_length=5, null=True)), ('faction_id', models.PositiveIntegerField(blank=True, default=None, null=True)), - ('faction_name', models.CharField(blank=True, default='', max_length=254)), + ('faction_name', models.CharField(blank=True, default='', max_length=254, null=True)), ], options={ 'indexes': [models.Index(fields=['corporation_id'], name='eveonline_e_corpora_cb4cd9_idx'), models.Index(fields=['alliance_id'], name='eveonline_e_allianc_39ee2a_idx'), models.Index(fields=['corporation_name'], name='eveonline_e_corpora_893c60_idx'), models.Index(fields=['alliance_name'], name='eveonline_e_allianc_63fd98_idx'), models.Index(fields=['faction_id'], name='eveonline_e_faction_d5274e_idx')], diff --git a/allianceauth/eveonline/models.py b/allianceauth/eveonline/models.py index 41702ec2..37c358f7 100644 --- a/allianceauth/eveonline/models.py +++ b/allianceauth/eveonline/models.py @@ -209,10 +209,10 @@ class EveCharacter(models.Model): corporation_name = models.CharField(max_length=254) corporation_ticker = models.CharField(max_length=5) alliance_id = models.PositiveIntegerField(blank=True, null=True, default=None) - alliance_name = models.CharField(max_length=254, blank=True, default='') - alliance_ticker = models.CharField(max_length=5, blank=True, default='') + alliance_name = models.CharField(max_length=254, blank=True, null=True, default='') # noqa: DJ001 + alliance_ticker = models.CharField(max_length=5, blank=True, null=True, default='') # noqa: DJ001 faction_id = models.PositiveIntegerField(blank=True, null=True, default=None) - faction_name = models.CharField(max_length=254, blank=True, default='') + faction_name = models.CharField(max_length=254, blank=True, null=True, default='') # noqa: DJ001 objects = EveCharacterManager() provider = EveCharacterProviderManager()