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 branch 'develop' into develop-2.3

Browse Source
This commit is contained in:
Jeremy Stretch
2018-01-31 11:13:17 -05:00
parent 8b6d731cb6 b3243704df
commit 6b101d2c49
25 changed files with 275 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/utilities/templatetags/helpers.py
View File

@@ -114,7 +114,7 @@ def example_choices(field, arg=3):
if len(examples) == arg:
examples.append('etc.')
break
if not id:
if not id or not label:
continue
examples.append(label)
return ', '.join(examples) or 'None'