From 8edff64d94c8936b9d2405df74f83eb2eafdcfb1 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Mon, 4 Oct 2021 06:27:19 +0000 Subject: [PATCH] Fix bug with default discourse_username --- apiserver/apiserver/api/management/commands/run_daily.py | 2 +- apiserver/apiserver/api/models.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apiserver/apiserver/api/management/commands/run_daily.py b/apiserver/apiserver/api/management/commands/run_daily.py index 4829470..db9d131 100644 --- a/apiserver/apiserver/api/management/commands/run_daily.py +++ b/apiserver/apiserver/api/management/commands/run_daily.py @@ -32,7 +32,7 @@ class Command(BaseCommand): 'protospace_instructors': [], } - for user in User.objects.filter(member__discourse_username__isnull=False): + for user in User.objects.exclude(member__discourse_username__exact=''): username = user.member.discourse_username # handle non-member vs. member diff --git a/apiserver/apiserver/api/models.py b/apiserver/apiserver/api/models.py index 120c778..703eec5 100644 --- a/apiserver/apiserver/api/models.py +++ b/apiserver/apiserver/api/models.py @@ -27,8 +27,8 @@ class Member(models.Model): last_name = models.CharField(max_length=32) preferred_name = models.CharField(max_length=32) phone = models.CharField(default='', max_length=32, null=True) - emergency_contact_name = models.CharField(max_length=64, blank=True) - emergency_contact_phone = models.CharField(max_length=32, blank=True) + emergency_contact_name = models.CharField(default='', max_length=64, blank=True) + emergency_contact_phone = models.CharField(default='', max_length=32, blank=True) birthdate = models.DateField(blank=True, null=True) is_minor = models.BooleanField(default=False) guardian_name = models.CharField(max_length=32, blank=True, null=True) @@ -58,7 +58,7 @@ class Member(models.Model): paused_date = models.DateField(blank=True, null=True) monthly_fees = models.IntegerField(default=55, blank=True, null=True) is_allowed_entry = models.BooleanField(default=True) - discourse_username = models.CharField(default=None, max_length=40, blank=True, null=True) + discourse_username = models.CharField(default='', max_length=40, blank=True, null=True) history = HistoricalRecords(excluded_fields=['member_forms'])