tag models translations in interface dictionary
This commit is contained in:
parent
72e5d723db
commit
d1699e001e
|
|
@ -51,7 +51,7 @@ class TagCategoryFilterSet(TagsBaseFilterSet):
|
||||||
# todo: filter by establishment type
|
# todo: filter by establishment type
|
||||||
def by_establishment_type(self, queryset, name, value):
|
def by_establishment_type(self, queryset, name, value):
|
||||||
if value == EstablishmentType.ARTISAN:
|
if value == EstablishmentType.ARTISAN:
|
||||||
qs = models.TagCategory.objects.filter(index_name='shop_category')
|
qs = models.TagCategory.objects.with_base_related().filter(index_name='shop_category')
|
||||||
else:
|
else:
|
||||||
qs = queryset.by_establishment_type(value)
|
qs = queryset.by_establishment_type(value)
|
||||||
return qs
|
return qs
|
||||||
|
|
|
||||||
46
apps/tag/migrations/0016_auto_20191220_1224.py
Normal file
46
apps/tag/migrations/0016_auto_20191220_1224.py
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
# Generated by Django 2.2.7 on 2019-12-20 12:24
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
def fill_translations(apps, schemaeditor):
|
||||||
|
Tag = apps.get_model('tag', 'Tag')
|
||||||
|
TagCategory = apps.get_model('tag', 'TagCategory')
|
||||||
|
SiteInterfaceDictionary = apps.get_model('translation', 'SiteInterfaceDictionary')
|
||||||
|
|
||||||
|
for tag_category in TagCategory.objects.all():
|
||||||
|
if tag_category.label:
|
||||||
|
t = SiteInterfaceDictionary(text=tag_category.label)
|
||||||
|
t.save()
|
||||||
|
tag_category.translation = t
|
||||||
|
tag_category.save()
|
||||||
|
|
||||||
|
for tag in Tag.objects.all():
|
||||||
|
if tag.label:
|
||||||
|
t = SiteInterfaceDictionary(text=tag.label)
|
||||||
|
t.save()
|
||||||
|
tag.translation = t
|
||||||
|
tag.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('translation', '0007_language_is_active'),
|
||||||
|
('tag', '0015_auto_20191118_1210'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='tag',
|
||||||
|
name='translation',
|
||||||
|
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tag', to='translation.SiteInterfaceDictionary', verbose_name='Translation'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='tagcategory',
|
||||||
|
name='translation',
|
||||||
|
field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tag_category', to='translation.SiteInterfaceDictionary', verbose_name='Translation'),
|
||||||
|
),
|
||||||
|
migrations.RunPython(fill_translations, migrations.RunPython.noop)
|
||||||
|
]
|
||||||
|
|
@ -5,7 +5,7 @@ from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from configuration.models import TranslationSettings
|
from configuration.models import TranslationSettings
|
||||||
from location.models import Country
|
from location.models import Country
|
||||||
from utils.models import TJSONField, TranslatedFieldsMixin
|
from utils.models import TJSONField, TagsTranslationModelMixin
|
||||||
|
|
||||||
|
|
||||||
class TagQuerySet(models.QuerySet):
|
class TagQuerySet(models.QuerySet):
|
||||||
|
|
@ -29,7 +29,7 @@ class TagQuerySet(models.QuerySet):
|
||||||
return self.filter(category__establishment_types__index_name=index_name)
|
return self.filter(category__establishment_types__index_name=index_name)
|
||||||
|
|
||||||
|
|
||||||
class Tag(TranslatedFieldsMixin, models.Model):
|
class Tag(models.Model, TagsTranslationModelMixin):
|
||||||
"""Tag model."""
|
"""Tag model."""
|
||||||
|
|
||||||
label = TJSONField(blank=True, null=True, default=None,
|
label = TJSONField(blank=True, null=True, default=None,
|
||||||
|
|
@ -48,6 +48,8 @@ class Tag(TranslatedFieldsMixin, models.Model):
|
||||||
|
|
||||||
old_id_meta_product = models.PositiveIntegerField(_('old id metadata product'),
|
old_id_meta_product = models.PositiveIntegerField(_('old id metadata product'),
|
||||||
blank=True, null=True, default=None)
|
blank=True, null=True, default=None)
|
||||||
|
translation = models.ForeignKey('translation.SiteInterfaceDictionary', on_delete=models.SET_NULL,
|
||||||
|
null=True, related_name='tag', verbose_name=_('Translation'))
|
||||||
|
|
||||||
objects = TagQuerySet.as_manager()
|
objects = TagQuerySet.as_manager()
|
||||||
|
|
||||||
|
|
@ -88,7 +90,7 @@ class TagCategoryQuerySet(models.QuerySet):
|
||||||
|
|
||||||
def with_base_related(self):
|
def with_base_related(self):
|
||||||
"""Select related objects."""
|
"""Select related objects."""
|
||||||
return self.prefetch_related('tags')
|
return self.prefetch_related('tags', 'tags__translation').select_related('translation')
|
||||||
|
|
||||||
def with_extended_related(self):
|
def with_extended_related(self):
|
||||||
"""Select related objects."""
|
"""Select related objects."""
|
||||||
|
|
@ -119,7 +121,7 @@ class TagCategoryQuerySet(models.QuerySet):
|
||||||
return self.exclude(tags__isnull=switcher)
|
return self.exclude(tags__isnull=switcher)
|
||||||
|
|
||||||
|
|
||||||
class TagCategory(TranslatedFieldsMixin, models.Model):
|
class TagCategory(models.Model, TagsTranslationModelMixin):
|
||||||
"""Tag base category model."""
|
"""Tag base category model."""
|
||||||
|
|
||||||
STRING = 'string'
|
STRING = 'string'
|
||||||
|
|
@ -151,6 +153,8 @@ class TagCategory(TranslatedFieldsMixin, models.Model):
|
||||||
value_type = models.CharField(_('value type'), max_length=255,
|
value_type = models.CharField(_('value type'), max_length=255,
|
||||||
choices=VALUE_TYPE_CHOICES, default=LIST, )
|
choices=VALUE_TYPE_CHOICES, default=LIST, )
|
||||||
old_id = models.IntegerField(blank=True, null=True)
|
old_id = models.IntegerField(blank=True, null=True)
|
||||||
|
translation = models.OneToOneField('translation.SiteInterfaceDictionary', on_delete=models.SET_NULL,
|
||||||
|
null=True, related_name='tag_category', verbose_name=_('Translation'))
|
||||||
|
|
||||||
objects = TagCategoryQuerySet.as_manager()
|
objects = TagCategoryQuerySet.as_manager()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,18 @@ def translate_field(self, field_name, toggle_field_name=None):
|
||||||
return None
|
return None
|
||||||
return translate
|
return translate
|
||||||
|
|
||||||
|
def translate_by_relation(self):
|
||||||
|
def translate(self):
|
||||||
|
field = self.translation.text if self.translation else None
|
||||||
|
if not isinstance(field, dict):
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
return field.get(to_locale(get_language()),
|
||||||
|
field.get(get_default_locale(),
|
||||||
|
next(iter(field.values()))))
|
||||||
|
except StopIteration:
|
||||||
|
return None
|
||||||
|
return translate
|
||||||
|
|
||||||
# todo: refactor this
|
# todo: refactor this
|
||||||
class IndexJSON:
|
class IndexJSON:
|
||||||
|
|
@ -135,6 +147,14 @@ class TranslatedFieldsMixin:
|
||||||
return value if value else super(TranslatedFieldsMixin, self).__str__()
|
return value if value else super(TranslatedFieldsMixin, self).__str__()
|
||||||
|
|
||||||
|
|
||||||
|
class TagsTranslationModelMixin:
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super(TagsTranslationModelMixin, self).__init__(*args, **kwargs)
|
||||||
|
setattr(self.__class__, 'label_translated',
|
||||||
|
property(translate_by_relation(self)))
|
||||||
|
setattr(self.__class__, 'label_indexing',
|
||||||
|
property(lambda self: self.translation.text))
|
||||||
|
|
||||||
class OAuthProjectMixin:
|
class OAuthProjectMixin:
|
||||||
"""OAuth2 mixin for project GM"""
|
"""OAuth2 mixin for project GM"""
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user