Merge pull request #570 from digitalocean/develop

Release v1.6.1-r1
netbox-community · Sep 21, 2016 · bffabef · bffabef
2 parents b997040 + 325d96d
commit bffabef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
 

diff --git a/netbox/extras/models.py b/netbox/extras/models.py
@@ -71,9 +71,9 @@ def cf(self):
         """
         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
@@ -12,7 +12,7 @@
                                "the documentation.")
 
 
-VERSION = '1.6.1'
+VERSION = '1.6.1-r1'
 
 # Import local configuration
 for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: