mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge pull request #570 from digitalocean/develop

Browse Source 
Release v1.6.1-r1
This commit is contained in:
Jeremy Stretch
2016-09-21 11:44:45 -04:00
committed by GitHub
parent b99704082b 325d96dabb
commit bffabef556
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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/). 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 ### Build Status

4
netbox/extras/models.py
View File

@ -71,9 +71,9 @@ class CustomFieldModel(object):
""" """
Name-based CustomFieldValue accessor for use in templates Name-based CustomFieldValue accessor for use in templates
""" """
if not hasattr(self, 'custom_fields'): if not hasattr(self, 'get_custom_fields'):
return dict() 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): def get_custom_fields(self):
""" """

2
netbox/netbox/settings.py
View File

@ -12,7 +12,7 @@ except ImportError:
"the documentation.") "the documentation.")
VERSION = '1.6.1' VERSION = '1.6.1-r1'
# Import local configuration # Import local configuration
for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: