From 6d2aee572a9bcbee04759f0095cc1daf191e81ee Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 23 Jan 2020 18:02:12 +0300 Subject: [PATCH] fix configs --- apps/location/models.py | 11 ++++------- apps/location/views/common.py | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/location/models.py b/apps/location/models.py index 88dc8472..97c02dd7 100644 --- a/apps/location/models.py +++ b/apps/location/models.py @@ -80,22 +80,19 @@ class RegionQuerySet(models.QuerySet): def without_parent_region(self, switcher: bool = True): """Filter regions by parent region.""" - return self.filter(parent_region__isnull=switcher)\ - .order_by('code') + return self.filter(parent_region__isnull=switcher) def by_region_id(self, region_id): """Filter regions by region id.""" - return self.filter(id=region_id)\ - .order_by('code') + return self.filter(id=region_id) def by_sub_region_id(self, sub_region_id): """Filter sub regions by sub region id.""" - return self.filter(parent_region_id=sub_region_id)\ - .order_by('code') + return self.filter(parent_region_id=sub_region_id) def sub_regions_by_region_id(self, region_id): """Filter regions by sub region id.""" - return self.filter(parent_region_id=region_id).order_by('code') + return self.filter(parent_region_id=region_id) class Region(models.Model): diff --git a/apps/location/views/common.py b/apps/location/views/common.py index d9d5520b..963c0cae 100644 --- a/apps/location/views/common.py +++ b/apps/location/views/common.py @@ -18,7 +18,7 @@ class CountryViewMixin(generics.GenericAPIView): class RegionViewMixin(generics.GenericAPIView): """View Mixin for model Region""" model = models.Region - queryset = models.Region.objects.all() + queryset = models.Region.objects.all().order_by('name') class CityViewMixin(generics.GenericAPIView):