sort by modified_at

This commit is contained in:
Kuroshini 2020-02-10 14:25:33 +03:00
parent 5cb6dc9fc6
commit 9781014626
3 changed files with 26 additions and 2 deletions

View File

@ -0,0 +1,24 @@
# Generated by Django 2.2.7 on 2020-02-10 11:24
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('location', '0040_auto_20200203_1454'),
]
operations = [
migrations.AddField(
model_name='city',
name='created',
field=models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created'),
),
migrations.AddField(
model_name='city',
name='modified',
field=models.DateTimeField(auto_now=True, verbose_name='Date updated'),
),
]

View File

@ -182,7 +182,7 @@ class CityQuerySet(models.QuerySet):
return self.prefetch_related('country', 'region', 'region__country')
class City(models.Model, TranslatedFieldsMixin):
class City(TranslatedFieldsMixin, ProjectBaseMixin):
"""Region model."""
name = TJSONField(default=None, null=True, help_text='{"en-GB":"some city name"}',
verbose_name=_('City name json'))

View File

@ -138,7 +138,7 @@ class CityListCreateView(common.CityViewMixin, generics.ListCreateAPIView):
def get_queryset(self):
"""Overridden method 'get_queryset'."""
qs = models.City.objects.all().annotate(locale_name=KeyTextTransform(get_current_locale(), 'name'))\
.order_by('locale_name').with_base_related()
.order_by('-modified').with_base_related()
if self.request.country_code and self.request.query_params.get('country_code') is None:
qs = qs.by_country_code(self.request.country_code)
return qs