sort by modified_at
This commit is contained in:
parent
5cb6dc9fc6
commit
9781014626
24
apps/location/migrations/0041_auto_20200210_1124.py
Normal file
24
apps/location/migrations/0041_auto_20200210_1124.py
Normal 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'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -182,7 +182,7 @@ class CityQuerySet(models.QuerySet):
|
||||||
return self.prefetch_related('country', 'region', 'region__country')
|
return self.prefetch_related('country', 'region', 'region__country')
|
||||||
|
|
||||||
|
|
||||||
class City(models.Model, TranslatedFieldsMixin):
|
class City(TranslatedFieldsMixin, ProjectBaseMixin):
|
||||||
"""Region model."""
|
"""Region model."""
|
||||||
name = TJSONField(default=None, null=True, help_text='{"en-GB":"some city name"}',
|
name = TJSONField(default=None, null=True, help_text='{"en-GB":"some city name"}',
|
||||||
verbose_name=_('City name json'))
|
verbose_name=_('City name json'))
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ class CityListCreateView(common.CityViewMixin, generics.ListCreateAPIView):
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
"""Overridden method 'get_queryset'."""
|
"""Overridden method 'get_queryset'."""
|
||||||
qs = models.City.objects.all().annotate(locale_name=KeyTextTransform(get_current_locale(), 'name'))\
|
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:
|
if self.request.country_code and self.request.query_params.get('country_code') is None:
|
||||||
qs = qs.by_country_code(self.request.country_code)
|
qs = qs.by_country_code(self.request.country_code)
|
||||||
return qs
|
return qs
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user