From 4a0a305e2cbedb234646b9ea7a805a1f7349a28e Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 1/3] tag category indexing name --- .../0005_tagcategory_name_indexing.py | 18 ++++++++++++++++++ apps/tag/models.py | 2 ++ apps/tag/serializers.py | 3 ++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 apps/tag/migrations/0005_tagcategory_name_indexing.py diff --git a/apps/tag/migrations/0005_tagcategory_name_indexing.py b/apps/tag/migrations/0005_tagcategory_name_indexing.py new file mode 100644 index 00000000..839b5747 --- /dev/null +++ b/apps/tag/migrations/0005_tagcategory_name_indexing.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-10-22 15:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tag', '0004_tag_priority'), + ] + + operations = [ + migrations.AddField( + model_name='tagcategory', + name='name_indexing', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='indexing name'), + ), + ] diff --git a/apps/tag/models.py b/apps/tag/models.py index 44eacddc..dbacbd2c 100644 --- a/apps/tag/models.py +++ b/apps/tag/models.py @@ -69,6 +69,8 @@ class TagCategory(TranslatedFieldsMixin, models.Model): on_delete=models.SET_NULL, null=True, default=None) public = models.BooleanField(default=False) + name_indexing = models.CharField(max_length=255, blank=True, null=True, + verbose_name=_('indexing name')) objects = TagCategoryQuerySet.as_manager() diff --git a/apps/tag/serializers.py b/apps/tag/serializers.py index 6ee55c84..445042c7 100644 --- a/apps/tag/serializers.py +++ b/apps/tag/serializers.py @@ -49,7 +49,8 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer): fields = ( 'id', 'label_translated', - 'tags' + 'name_indexing', + 'tags', ) From f46d4bd9f1173331d312f52bdddb7670bc657b5c Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 2/3] Review fix --- apps/tag/migrations/0005_tagcategory_name_indexing.py | 2 +- apps/tag/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/tag/migrations/0005_tagcategory_name_indexing.py b/apps/tag/migrations/0005_tagcategory_name_indexing.py index 839b5747..7fcb7f0f 100644 --- a/apps/tag/migrations/0005_tagcategory_name_indexing.py +++ b/apps/tag/migrations/0005_tagcategory_name_indexing.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( model_name='tagcategory', - name='name_indexing', + name='index_name', field=models.CharField(blank=True, max_length=255, null=True, verbose_name='indexing name'), ), ] diff --git a/apps/tag/models.py b/apps/tag/models.py index dbacbd2c..6e7ec65e 100644 --- a/apps/tag/models.py +++ b/apps/tag/models.py @@ -69,8 +69,8 @@ class TagCategory(TranslatedFieldsMixin, models.Model): on_delete=models.SET_NULL, null=True, default=None) public = models.BooleanField(default=False) - name_indexing = models.CharField(max_length=255, blank=True, null=True, - verbose_name=_('indexing name')) + index_name = models.CharField(max_length=255, blank=True, null=True, + verbose_name=_('indexing name'), unique=True) objects = TagCategoryQuerySet.as_manager() From 125c438f199359a556f726dba903aad053b3f789 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 3/3] Review fix #2 --- apps/tag/migrations/0005_tagcategory_name_indexing.py | 2 +- apps/tag/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tag/migrations/0005_tagcategory_name_indexing.py b/apps/tag/migrations/0005_tagcategory_name_indexing.py index 7fcb7f0f..2547481a 100644 --- a/apps/tag/migrations/0005_tagcategory_name_indexing.py +++ b/apps/tag/migrations/0005_tagcategory_name_indexing.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='tagcategory', name='index_name', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='indexing name'), + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='indexing name', unique=True), ), ] diff --git a/apps/tag/models.py b/apps/tag/models.py index 6e7ec65e..1ee594ad 100644 --- a/apps/tag/models.py +++ b/apps/tag/models.py @@ -70,7 +70,7 @@ class TagCategory(TranslatedFieldsMixin, models.Model): default=None) public = models.BooleanField(default=False) index_name = models.CharField(max_length=255, blank=True, null=True, - verbose_name=_('indexing name'), unique=True) + verbose_name=_('indexing name'), unique=True) objects = TagCategoryQuerySet.as_manager()