From 623d8f0de0137e91b06dd4ba2a81272c0c6fb2b1 Mon Sep 17 00:00:00 2001 From: teryaev-anton Date: Fri, 1 Sep 2023 21:14:58 +0500 Subject: [PATCH] merging from develop, delete comment-string, rebuild migrations bot_settings --- ..._title_alter_botsettings_type_and_more.py} | 15 +++++++++++- .../migrations/0003_alter_botsettings_type.py | 23 ------------------ .../migrations/0004_alter_botsettings_type.py | 24 ------------------- .../migrations/0004_merge_20230830_1608.py | 17 ------------- .../migrations/0005_merge_20230901_0636.py | 14 ----------- .../0003_alter_region_region_name.py | 24 +++++++++++++++++++ 6 files changed, 38 insertions(+), 79 deletions(-) rename src/bot_settings/migrations/{0003_alter_botsettings_title_alter_botsettings_value.py => 0003_alter_botsettings_title_alter_botsettings_type_and_more.py} (67%) delete mode 100644 src/bot_settings/migrations/0003_alter_botsettings_type.py delete mode 100644 src/bot_settings/migrations/0004_alter_botsettings_type.py delete mode 100644 src/bot_settings/migrations/0004_merge_20230830_1608.py delete mode 100644 src/bot_settings/migrations/0005_merge_20230901_0636.py create mode 100644 src/core/migrations/0003_alter_region_region_name.py diff --git a/src/bot_settings/migrations/0003_alter_botsettings_title_alter_botsettings_value.py b/src/bot_settings/migrations/0003_alter_botsettings_title_alter_botsettings_type_and_more.py similarity index 67% rename from src/bot_settings/migrations/0003_alter_botsettings_title_alter_botsettings_value.py rename to src/bot_settings/migrations/0003_alter_botsettings_title_alter_botsettings_type_and_more.py index 8f7c8821..7bdd26a8 100644 --- a/src/bot_settings/migrations/0003_alter_botsettings_title_alter_botsettings_value.py +++ b/src/bot_settings/migrations/0003_alter_botsettings_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 deleted file mode 100644 index f24801f4..00000000 --- a/src/bot_settings/migrations/0003_alter_botsettings_type.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.2.4 on 2023-08-30 02:22 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - """Migrations for bot settings.""" - - dependencies = [ - ("bot_settings", "0002_add_settings"), - ] - - operations = [ - migrations.AlterField( - model_name="botsettings", - name="type", - field=models.CharField( - choices=[("url", "URL"), ("text", "TEXT"), ("int", "INT")], - max_length=100, - verbose_name="Тип значения", - ), - ), - ] diff --git a/src/bot_settings/migrations/0004_alter_botsettings_type.py b/src/bot_settings/migrations/0004_alter_botsettings_type.py deleted file mode 100644 index 3d4c28c1..00000000 --- a/src/bot_settings/migrations/0004_alter_botsettings_type.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.2.4 on 2023-08-30 17:04 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ( - "bot_settings", - "0003_alter_botsettings_title_alter_botsettings_value", - ), - ] - - operations = [ - migrations.AlterField( - model_name="botsettings", - name="type", - field=models.CharField( - choices=[("url", "Ссылка"), ("text", "Текст")], - max_length=100, - verbose_name="Тип значения", - ), - ), - ] diff --git a/src/bot_settings/migrations/0004_merge_20230830_1608.py b/src/bot_settings/migrations/0004_merge_20230830_1608.py deleted file mode 100644 index a410b2ce..00000000 --- a/src/bot_settings/migrations/0004_merge_20230830_1608.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.4 on 2023-08-30 11:08 - -from django.db import migrations - - -class Migration(migrations.Migration): - """Migrations for bot settings.""" - - dependencies = [ - ( - "bot_settings", - "0003_alter_botsettings_title_alter_botsettings_value", - ), - ("bot_settings", "0003_alter_botsettings_type"), - ] - - operations = [] diff --git a/src/bot_settings/migrations/0005_merge_20230901_0636.py b/src/bot_settings/migrations/0005_merge_20230901_0636.py deleted file mode 100644 index e8293ca5..00000000 --- a/src/bot_settings/migrations/0005_merge_20230901_0636.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 4.2.4 on 2023-09-01 01:36 - -from django.db import migrations - - -class Migration(migrations.Migration): - """Migrations for bot settings.""" - - dependencies = [ - ("bot_settings", "0004_alter_botsettings_type"), - ("bot_settings", "0004_merge_20230830_1608"), - ] - - operations = [] diff --git a/src/core/migrations/0003_alter_region_region_name.py b/src/core/migrations/0003_alter_region_region_name.py new file mode 100644 index 00000000..a53bba19 --- /dev/null +++ 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="Название региона", + ), + ), + ]