diff --git a/program/migrations/0108_rename_fallback_pools_radiosettings_pools.py b/program/migrations/0108_rename_fallback_pools_radiosettings_pools.py new file mode 100644 index 0000000000000000000000000000000000000000..941778ba5eea239cc90617f9472a05099932b04a --- /dev/null +++ b/program/migrations/0108_rename_fallback_pools_radiosettings_pools.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.13 on 2024-07-04 16:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("program", "0107_alter_show_options_alter_timeslot_options"), + ] + + operations = [ + migrations.RenameField( + model_name="radiosettings", + old_name="fallback_pools", + new_name="pools", + ), + ] diff --git a/program/models.py b/program/models.py index ae0d6c3243e6a32ca7f9aa5a1c78711d8ab4bed0..6974b600752cfdd5ee0140c48e36d21b00215d34 100644 --- a/program/models.py +++ b/program/models.py @@ -628,8 +628,8 @@ def validate_fallback_pools(value): def validate_fallback_default_pool(value): - if value not in RadioSettings.objects.first().fallback_pools.keys(): - raise DjangoValidationError(f"Pool key '{value}' does not exist in fallback pools.") + if value not in RadioSettings.objects.first().pools.keys(): + raise DjangoValidationError(f"Pool key '{value}' does not exist in pools.") class RadioSettings(models.Model): @@ -644,12 +644,6 @@ class RadioSettings(models.Model): fallback_default_pool = models.CharField( blank=True, max_length=32, validators=[validate_fallback_default_pool] ) - fallback_pools = models.JSONField( - blank=True, - default=dict, - help_text="JSON key/value pairs", - validators=[validate_fallback_pools], - ) fallback_show = models.ForeignKey( Show, blank=True, null=True, on_delete=models.CASCADE, related_name="+" ) @@ -666,6 +660,12 @@ class RadioSettings(models.Model): ) note_image_aspect_ratio = ImageAspectRadioField(default="16:9") note_image_shape = ImageShapeField(default="rect") + pools = models.JSONField( + blank=True, + default=dict, + help_text="JSON key/value pairs", + validators=[validate_fallback_pools], + ) show_image_aspect_ratio = ImageAspectRadioField(default="16:9") show_image_shape = ImageShapeField(default="rect") show_logo_aspect_ratio = ImageAspectRadioField(default="1:1")