caspervk/drakul
1
0
Fork 0
Code Releases Activity

Move clean logic to clean() instead of save()

Browse source
This commit is contained in:
Casper V. Kristensen 2019-11-19 04:18:47 +01:00
parent 9af691f8ca
commit 0ac3bda6b7
Signed by: caspervk
GPG key ID: 289CA03790535054
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drakul/raids/models.py
View file

@ -26,10 +26,9 @@ class Raid(models.Model):
class Meta: class Meta:
ordering = ["-date"] ordering = ["-date"]
def save(self, *args, **kwargs): def clean(self):
if self.response_deadline is None: if self.response_deadline is None:
self.response_deadline = self.date - timedelta(hours=24) self.response_deadline = self.date - timedelta(hours=24)
return super().save(*args, **kwargs)
def __str__(self): def __str__(self):
return f"{self.title} on {self.date}" return f"{self.title} on {self.date}"

5
drakul/users/models.py
View file

@ -41,14 +41,13 @@ class User(AbstractUser):
ordering = ["rank", "username"] ordering = ["rank", "username"]
def clean(self): def clean(self):
if not hasattr(self, "rank"):
self.rank = Rank.objects.last()
if hasattr(self, "main") and self.main.user != self: if hasattr(self, "main") and self.main.user != self:
raise ValidationError({"main": "Main character must be owned by user."}) raise ValidationError({"main": "Main character must be owned by user."})
@transaction.atomic @transaction.atomic
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not hasattr(self, "rank"):
self.rank = Rank.objects.last()
if not hasattr(self, "main"): if not hasattr(self, "main"):
self.main = Character.objects.create( self.main = Character.objects.create(
user=None, user=None,