NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-19 20:02:22 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-2.8

Browse Source
This commit is contained in:
Jeremy Stretch
2020-02-21 15:26:55 -05:00
parent 38ff01e874 12602a95ea
commit 28e3b7af18
69 changed files with 722 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/ipam/managers.py
View File

@@ -1,5 +1,6 @@
from django.db import models
from django.db.models.expressions import RawSQL
from ipam.lookups import Host, Inet
class IPAddressManager(models.Manager):
@@ -13,4 +14,4 @@ class IPAddressManager(models.Manager):
IP address as a /32 or /128.
"""
qs = super().get_queryset()
return qs.annotate(host=RawSQL('INET(HOST(ipam_ipaddress.address))', [])).order_by('host')
return qs.order_by(Inet(Host('address')))