Merge pull request #2841 from digitalfabrik/bugfix/migration

Merge migrations
digitalfabrik · Jun 11, 2024 · 234e040 · 234e040
2 parents 7c5fe62 + a63ea6d
commit 234e040
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 63 deletions.
diff --git a/...cms/migrations/0093_add_language_color.py → ...igrations/0093_language_language_color.py b/...cms/migrations/0093_add_language_color.py → ...igrations/0093_language_language_color.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-04-03 08:12
+# Generated by Django 4.2.10 on 2024-06-11 12:16
 
 from django.db import migrations, models
 
@@ -17,7 +17,6 @@ class Migration(migrations.Migration):
             model_name="language",
             name="language_color",
             field=models.CharField(
-                blank=False,
                 choices=[
                     ("#FFBB78", "Mellow apricot"),
                     ("#2CA02C", "Forest green"),
@@ -53,6 +52,7 @@ class Migration(migrations.Migration):
                     ("#FFDAB9", "Almond"),
                     ("#D62728", "Cherry"),
                 ],
+                default="#000000",
                 help_text="This color is used to represent the color label of the chosen language",
                 max_length=7,
                 verbose_name="language color",

diff --git a/integreat_cms/cms/migrations/0094_add_default_language_color.py b/integreat_cms/cms/migrations/0094_add_default_language_color.py