From 89ae0d13d7e8e0469a118a3400148d27a27a798e Mon Sep 17 00:00:00 2001 From: Tom Teichler <tom.teichler@teckids.org> Date: Wed, 7 Jun 2023 23:23:56 +0200 Subject: [PATCH] Merge save methods --- aleksis/apps/paweljong/models.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aleksis/apps/paweljong/models.py b/aleksis/apps/paweljong/models.py index 70a97b5..292dbc4 100644 --- a/aleksis/apps/paweljong/models.py +++ b/aleksis/apps/paweljong/models.py @@ -311,10 +311,6 @@ class EventRegistration(ExtensibleModel): cost = models.IntegerField(verbose_name=_("Cost in €"), null=True, blank=True) - def save(self, *args, **kwargs): - if self.cost is not None: - self.cost = self.event.cost - super().save(*args, **kwargs) def mark_checked_in(self): if not self.checked_in: @@ -420,6 +416,8 @@ class EventRegistration(ExtensibleModel): def save(self, *args, **kwargs): self.event.sync_group_members() + if self.cost is None: + self.cost = self.event.cost super().save(*args, **kwargs) def delete(self, *args, **kwargs): -- GitLab