This commit is contained in:
a.gorbunov 2020-01-22 14:57:37 +00:00
parent c78c6a67b1
commit 749775075c

View File

@ -81,21 +81,21 @@ class RegionQuerySet(models.QuerySet):
def without_parent_region(self, switcher: bool = True): def without_parent_region(self, switcher: bool = True):
"""Filter regions by parent region.""" """Filter regions by parent region."""
return self.filter(parent_region__isnull=switcher)\ return self.filter(parent_region__isnull=switcher)\
.order_by('name') .order_by('code')
def by_region_id(self, region_id): def by_region_id(self, region_id):
"""Filter regions by region id.""" """Filter regions by region id."""
return self.filter(id=region_id)\ return self.filter(id=region_id)\
.order_by('name') .order_by('code')
def by_sub_region_id(self, sub_region_id): def by_sub_region_id(self, sub_region_id):
"""Filter sub regions by sub region id.""" """Filter sub regions by sub region id."""
return self.filter(parent_region_id=sub_region_id)\ return self.filter(parent_region_id=sub_region_id)\
.order_by('name') .order_by('code')
def sub_regions_by_region_id(self, region_id): def sub_regions_by_region_id(self, region_id):
"""Filter regions by sub region id.""" """Filter regions by sub region id."""
return self.filter(parent_region_id=region_id).order_by('name') return self.filter(parent_region_id=region_id).order_by('code')
class Region(models.Model): class Region(models.Model):