NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-21 11:37:21 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge pull request #3131 from digitalocean/develop

Browse Source 
Release v2.5.12
This commit is contained in:
Jeremy Stretch 2019-05-01 11:10:43 -04:00 committed by GitHub
commit ceeac9bae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,3 +1,11 @@
2.5.12 (2019-05-01)
## Bug Fixes
* [#3127](https://github.com/digitalocean/netbox/issues/3127) - Fix natural ordering of device components
---
2.5.11 (2019-04-29) 2.5.11 (2019-04-29)
## Notes ## Notes

2
docs/administration/replicating-netbox.md
View File

@ -30,7 +30,7 @@ psql -c 'create database netbox'
psql netbox < netbox.sql psql netbox < netbox.sql
``` ```
Keep in mind that PostgreSQL user accounts and permissions are not included with the dump: You will need to create those manually if you want to fully replicate the original database (see the [installation docs](installation/1-postgresql.md)). When setting up a development instance of NetBox, it's strongly recommended to use different credentials anyway. Keep in mind that PostgreSQL user accounts and permissions are not included with the dump: You will need to create those manually if you want to fully replicate the original database (see the [installation docs](../installation/1-postgresql.md)). When setting up a development instance of NetBox, it's strongly recommended to use different credentials anyway.
## Export the Database Schema ## Export the Database Schema

2
netbox/netbox/settings.py
View File

@ -22,7 +22,7 @@ except ImportError:
) )
VERSION = '2.5.11' VERSION = '2.5.12'
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

4
netbox/utilities/managers.py
View File

@ -37,4 +37,8 @@ class NaturalOrderingManager(Manager):
else: else:
ordering.append(field) ordering.append(field)
# Default to using the _nat indexes if Meta.ordering is empty
if not ordering:
ordering = ('_nat1', '_nat2', '_nat3')
return queryset.order_by(*ordering) return queryset.order_by(*ordering)