From aa2612aeba535816f7ef27787236b4adfcc300c6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 21 Sep 2016 10:15:03 -0400 Subject: [PATCH 1/3] 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 b64f5e4b3..ef25ae84f 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -12,7 +12,7 @@ except ImportError: "the documentation.") -VERSION = '1.6.1' +VERSION = '1.6.2-dev' # Import local configuration for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: From b7b1682f42d9891c9a9671fb51df440bc3220aa6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 21 Sep 2016 11:02:19 -0400 Subject: [PATCH 2/3] Added link to the mailing list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28c73b2cc..f97d27394 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ NetBox runs as a web application atop the [Django](https://www.djangoproject.com The complete documentation for Netbox can be found at [Read the Docs](http://netbox.readthedocs.io/en/latest/). -Questions? Comments? Please join us on IRC in **#netbox** on **irc.freenode.net**! +Questions? Comments? Please subscribe to [the netbox-disucss mailing list](https://groups.google.com/forum/#!forum/netbox-discuss), or join us on IRC in **#netbox** on **irc.freenode.net**! ### Build Status From 325d96dabb050ac6edb937cb7210598fff83a265 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 21 Sep 2016 11:43:22 -0400 Subject: [PATCH 3/3] Quick fix for v1.6.1 related to #561 --- netbox/extras/models.py | 4 ++-- netbox/netbox/settings.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 4bc9f3550..64e84ef66 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -71,9 +71,9 @@ class CustomFieldModel(object): """ Name-based CustomFieldValue accessor for use in templates """ - if not hasattr(self, 'custom_fields'): + if not hasattr(self, 'get_custom_fields'): return dict() - return {field.name: value for field, value in self.custom_fields.items()} + return {field.name: value for field, value in self.get_custom_fields().items()} def get_custom_fields(self): """ diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index ef25ae84f..a7de9c47c 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -12,7 +12,7 @@ except ImportError: "the documentation.") -VERSION = '1.6.2-dev' +VERSION = '1.6.1-r1' # Import local configuration for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: