phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/fix-country-region-city-transfer' into feature/fix-country-region-city-transfer

Browse Source 
# Conflicts:
#	apps/location/models.py
This commit is contained in:
Anatoly 2019-12-24 12:25:42 +03:00
commit 62e12d8570
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/location/models.py
View File

@ -24,7 +24,8 @@ class CountryQuerySet(models.QuerySet):
return self.filter(is_active=switcher)
class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin):
class Country(TranslatedFieldsMixin,
SVGImageMixin, ProjectBaseMixin):
"""Country model."""
STR_FIELD_NAME = 'name'
@ -143,6 +144,9 @@ class CityQuerySet(models.QuerySet):
class City(GalleryMixin, models.Model):
"""Region model."""
name = models.CharField(_('name'), max_length=250)
name_translated = TJSONField(blank=True, null=True, default=None,
verbose_name=_('Translated name'),
help_text='{"en-GB":"some text"}')
code = models.CharField(_('code'), max_length=250)
region = models.ForeignKey(Region, on_delete=models.CASCADE,
blank=True, null=True,