dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2025-08-04 21:27:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the logic about scales in the consist and remove async updates

Browse Source
This commit is contained in:
Daniele Viganò
2025-05-02 13:39:42 +02:00
parent 7673f0514a
commit 60195bc99f
4 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ram/consist/models.py
View File

@@ -26,7 +26,7 @@ class Consist(BaseModel):
blank=True,
help_text="Era or epoch of the consist",
)
scale = models.ForeignKey(Scale, null=True, on_delete=models.CASCADE)
scale = models.ForeignKey(Scale, on_delete=models.CASCADE)
image = models.ImageField(
upload_to=os.path.join("images", "consists"),
storage=DeduplicatedStorage,
@@ -82,18 +82,6 @@ class ConsistItem(models.Model):
def __str__(self):
return "{0}".format(self.rolling_stock)
def save(self, *args, **kwargs):
super().save(*args, **kwargs)
if self.consist.scale != self.rolling_stock.scale:
self.consist.scale = self.rolling_stock.scale
self.consist.save()
def delete(self, *args, **kwargs):
super().delete(*args, **kwargs)
if not self.consist.consist_item.exists():
self.consist.scale = None
self.consist.save()
def clean(self):
rolling_stock = getattr(self, "rolling_stock", False)
if not rolling_stock:
@@ -103,14 +91,7 @@ class ConsistItem(models.Model):
# because the consist is not saved yet and it must be moved
# to the admin form validation via InlineFormSet.clean()
consist = self.consist
items = consist.consist_item
if (
consist.pk # if we are not creating a new consist
and items.exists() # if there's at least one item
and self != items.first() # if we are not changing the first item
# if scale is different from the first item
and rolling_stock.scale != items.first().rolling_stock.scale
):
if rolling_stock.scale != consist.scale:
raise ValidationError(
"The rolling stock and consist must be of the same scale."
)