From 83fddd63c3f9df7680d92b5b1df40ff07f1674d7 Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Mon, 23 Sep 2019 16:41:20 +0300 Subject: [PATCH 1/2] fix migration establishment --- .../migrations/0030_auto_20190923_1340.py | 18 ++++++++++++++++++ apps/establishment/serializers/common.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 apps/establishment/migrations/0030_auto_20190923_1340.py diff --git a/apps/establishment/migrations/0030_auto_20190923_1340.py b/apps/establishment/migrations/0030_auto_20190923_1340.py new file mode 100644 index 00000000..9599b200 --- /dev/null +++ b/apps/establishment/migrations/0030_auto_20190923_1340.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-09-23 13:40 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0029_establishment_name_transliterated'), + ] + + operations = [ + migrations.RenameField( + model_name='establishment', + old_name='name_transliterated', + new_name='name_translated', + ), + ] diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 5eb1b9ae..2edf811c 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -154,7 +154,7 @@ class EstablishmentBaseSerializer(serializers.ModelSerializer): fields = [ 'id', 'name', - 'name_transliterated', + 'name_translated', 'price_level', 'toque_number', 'public_mark', From 8f60937e4ba68c2fd17683918856410a67ff5ce2 Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Mon, 23 Sep 2019 16:44:28 +0300 Subject: [PATCH 2/2] Fix migration collection --- .../migrations/0012_auto_20190923_1340.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 apps/collection/migrations/0012_auto_20190923_1340.py diff --git a/apps/collection/migrations/0012_auto_20190923_1340.py b/apps/collection/migrations/0012_auto_20190923_1340.py new file mode 100644 index 00000000..50725597 --- /dev/null +++ b/apps/collection/migrations/0012_auto_20190923_1340.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.4 on 2019-09-23 13:40 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('collection', '0011_auto_20190920_1059'), + ] + + operations = [ + migrations.AlterField( + model_name='guide', + name='parent', + field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='collection.Guide', verbose_name='parent'), + ), + ]