From 66f90f46de30850b9992b56992ae88e546bfab24 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Apr 2019 16:37:32 -0400 Subject: [PATCH 1/6] Fix mkdocs --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index a0185e56e..e7a08c21d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,7 +2,7 @@ site_name: NetBox theme: readthedocs repo_url: https://github.com/digitalocean/netbox -pages: +nav: - Introduction: 'index.md' - Installation: - Installing NetBox: 'installation/index.md' From b7a5afa797b2cea1b98d9ea97bb26fee383f61e0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Apr 2019 16:44:13 -0400 Subject: [PATCH 2/6] Revert previous change --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index e7a08c21d..a0185e56e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,7 +2,7 @@ site_name: NetBox theme: readthedocs repo_url: https://github.com/digitalocean/netbox -nav: +pages: - Introduction: 'index.md' - Installation: - Installing NetBox: 'installation/index.md' From 7b5c1964b9b4efc81a878c7b4b5a1a6a47aad098 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Apr 2019 16:55:17 -0400 Subject: [PATCH 3/6] Fix broken link --- docs/administration/replicating-netbox.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/administration/replicating-netbox.md b/docs/administration/replicating-netbox.md index 08e11fe56..6dd686594 100644 --- a/docs/administration/replicating-netbox.md +++ b/docs/administration/replicating-netbox.md @@ -30,7 +30,7 @@ psql -c 'create database netbox' 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 From 5a8ba159f2dd25d59ee0dccd3ff0b7341b4d3633 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Apr 2019 13:25:37 -0400 Subject: [PATCH 4/6] Fixes #3127: Fix natural ordering of device components --- CHANGELOG.md | 8 ++++++++ netbox/utilities/managers.py | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac66d83e3..192e3de14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +2.5.12 (2019-04-30) + +## Bug Fixes + +* [#3127](https://github.com/digitalocean/netbox/issues/3127) - Fix natural ordering of device components + +--- + 2.5.11 (2019-04-29) ## Notes diff --git a/netbox/utilities/managers.py b/netbox/utilities/managers.py index 724773c46..fc2497063 100644 --- a/netbox/utilities/managers.py +++ b/netbox/utilities/managers.py @@ -37,4 +37,8 @@ class NaturalOrderingManager(Manager): else: 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) From 5487ab40af14e8a3c44fceda1fc2369553c6ac55 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 1 May 2019 11:08:32 -0400 Subject: [PATCH 5/6] Release v2.5.12 --- CHANGELOG.md | 2 +- netbox/netbox/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 192e3de14..82a4a7e41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -2.5.12 (2019-04-30) +2.5.12 (2019-05-01) ## Bug Fixes diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index f8499a6ed..92b40cd5b 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -22,7 +22,7 @@ except ImportError: ) -VERSION = '2.5.12-dev' +VERSION = '2.5.12' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) From 49446ffb743f957b8170f9aad39b14c15491d4ee Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 1 May 2019 11:09:11 -0400 Subject: [PATCH 6/6] Post-release version bump --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 92b40cd5b..1708c07f0 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -22,7 +22,7 @@ except ImportError: ) -VERSION = '2.5.12' +VERSION = '2.5.13-dev' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))