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

Quick fix for v1.6.1 related to #561

Browse Source
This commit is contained in:
Jeremy Stretch 2016-09-21 11:43:22 -04:00
parent b7b1682f42
commit 325d96dabb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.2-dev' 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']: