merging from develop, delete comment-string, rebuild migrations bot_s…

…ettings
Studio-Yandex-Practicum · Sep 1, 2023 · 623d8f0 · 623d8f0
1 parent 71e12df
commit 623d8f0
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 79 deletions.
diff --git a/...settings_title_alter_botsettings_value.py → ..._title_alter_botsettings_type_and_more.py b/...settings_title_alter_botsettings_value.py → ..._title_alter_botsettings_type_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.4 on 2023-08-28 21:33
+# Generated by Django 4.2.4 on 2023-09-01 16:07
 
 import ckeditor.fields
 from django.db import migrations, models
@@ -21,6 +21,19 @@ class Migration(migrations.Migration):
                 verbose_name="Название настройки",
             ),
         ),
+        migrations.AlterField(
+            model_name="botsettings",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("url", "Ссылка"),
+                    ("text", "Текст"),
+                    ("int", "Число"),
+                ],
+                max_length=100,
+                verbose_name="Тип значения",
+            ),
+        ),
         migrations.AlterField(
             model_name="botsettings",
             name="value",

diff --git a/src/bot_settings/migrations/0003_alter_botsettings_type.py b/src/bot_settings/migrations/0003_alter_botsettings_type.py
diff --git a/src/bot_settings/migrations/0004_alter_botsettings_type.py b/src/bot_settings/migrations/0004_alter_botsettings_type.py
diff --git a/src/bot_settings/migrations/0004_merge_20230830_1608.py b/src/bot_settings/migrations/0004_merge_20230830_1608.py
diff --git a/src/bot_settings/migrations/0005_merge_20230901_0636.py b/src/bot_settings/migrations/0005_merge_20230901_0636.py
diff --git a/src/core/migrations/0003_alter_region_region_name.py b/src/core/migrations/0003_alter_region_region_name.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.4 on 2023-09-01 16:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    """Migrations for bot."""
+
+    dependencies = [
+        ("core", "0002_alter_region_region_name"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="region",
+            name="region_name",
+            field=models.CharField(
+                help_text="Это название так же будет отображаться на кнопках бота",
+                max_length=200,
+                unique=True,
+                verbose_name="Название региона",
+            ),
+        ),
+    ]