mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-12-24 00:50:35 +00:00
fixing errors from check
This commit is contained in:
parent
c99fe2bdc3
commit
bcdee8071c
2 changed files with 24 additions and 2 deletions
|
@ -0,0 +1,23 @@
|
||||||
|
# Generated by Django 3.2.12 on 2022-03-11 15:22
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("bookwyrm", "0145_auto_20220307_2025"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="sitesettings",
|
||||||
|
name="invite_question_text",
|
||||||
|
field=models.CharField(
|
||||||
|
blank=True,
|
||||||
|
default="What is your favourite book?",
|
||||||
|
max_length=255,
|
||||||
|
null=True,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
|
@ -103,12 +103,11 @@ class SiteSettings(models.Model):
|
||||||
return urljoin(STATIC_FULL_URL, default_path)
|
return urljoin(STATIC_FULL_URL, default_path)
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
"""if require_confirm_email is disabled, make sure no users are pending"""
|
"""if require_confirm_email is disabled, make sure no users are pending, if enabled, make sure invite_question_text is not empty"""
|
||||||
if not self.require_confirm_email:
|
if not self.require_confirm_email:
|
||||||
User.objects.filter(is_active=False, deactivation_reason="pending").update(
|
User.objects.filter(is_active=False, deactivation_reason="pending").update(
|
||||||
is_active=True, deactivation_reason=None
|
is_active=True, deactivation_reason=None
|
||||||
)
|
)
|
||||||
"""if invite_request_question is enabled, make sure invite_question_text is not empty"""
|
|
||||||
if not self.invite_question_text:
|
if not self.invite_question_text:
|
||||||
self.invite_question_text = "What is your favourite book?"
|
self.invite_question_text = "What is your favourite book?"
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
|
|
Loading…
Reference in a new issue