From e26d3767e0c04c37cfc611554af6eebe2b24a9d1 Mon Sep 17 00:00:00 2001 From: AaronKable Date: Fri, 18 Sep 2020 22:16:24 +0800 Subject: [PATCH] update models as NullBooleanField is deprecated. --- .../migrations/0014_auto_20200918_1412.py | 18 ++++++++++++++++++ allianceauth/groupmanagement/models.py | 2 +- .../migrations/0007_auto_20200918_1412.py | 18 ++++++++++++++++++ allianceauth/hrapplications/models.py | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 allianceauth/groupmanagement/migrations/0014_auto_20200918_1412.py create mode 100644 allianceauth/hrapplications/migrations/0007_auto_20200918_1412.py diff --git a/allianceauth/groupmanagement/migrations/0014_auto_20200918_1412.py b/allianceauth/groupmanagement/migrations/0014_auto_20200918_1412.py new file mode 100644 index 00000000..891f3e2c --- /dev/null +++ b/allianceauth/groupmanagement/migrations/0014_auto_20200918_1412.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.1 on 2020-09-18 14:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('groupmanagement', '0013_fix_requestlog_date_field'), + ] + + operations = [ + migrations.AlterField( + model_name='requestlog', + name='request_type', + field=models.BooleanField(null=True), + ), + ] diff --git a/allianceauth/groupmanagement/models.py b/allianceauth/groupmanagement/models.py index c0fca555..035b9ba2 100644 --- a/allianceauth/groupmanagement/models.py +++ b/allianceauth/groupmanagement/models.py @@ -25,7 +25,7 @@ class GroupRequest(models.Model): class RequestLog(models.Model): - request_type = models.NullBooleanField(default=0) + request_type = models.BooleanField(null=True) group = models.ForeignKey(Group, on_delete=models.CASCADE) request_info = models.CharField(max_length=254) action = models.BooleanField(default=0) diff --git a/allianceauth/hrapplications/migrations/0007_auto_20200918_1412.py b/allianceauth/hrapplications/migrations/0007_auto_20200918_1412.py new file mode 100644 index 00000000..aade3620 --- /dev/null +++ b/allianceauth/hrapplications/migrations/0007_auto_20200918_1412.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.1 on 2020-09-18 14:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hrapplications', '0006_remove_legacy_models'), + ] + + operations = [ + migrations.AlterField( + model_name='application', + name='approved', + field=models.BooleanField(blank=True, default=None, null=True), + ), + ] diff --git a/allianceauth/hrapplications/models.py b/allianceauth/hrapplications/models.py index d8fbd068..4767ec7f 100755 --- a/allianceauth/hrapplications/models.py +++ b/allianceauth/hrapplications/models.py @@ -35,7 +35,7 @@ class ApplicationForm(models.Model): class Application(models.Model): form = models.ForeignKey(ApplicationForm, on_delete=models.CASCADE, related_name='applications') user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='applications') - approved = models.NullBooleanField(blank=True, null=True, default=None) + approved = models.BooleanField(blank=True, null=True, default=None) reviewer = models.ForeignKey(User, on_delete=models.SET_NULL, blank=True, null=True) reviewer_character = models.ForeignKey(EveCharacter, on_delete=models.SET_NULL, blank=True, null=True) created = models.DateTimeField(auto_now_add=True)