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.4

Browse Source
This commit is contained in:
Jeremy Stretch
2018-04-19 11:24:11 -04:00
parent 7805848e6c e5454d6714
commit 57f6d22c64
7 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/utilities/forms.py
View File

@@ -205,7 +205,8 @@ class ArrayFieldSelectMultiple(SelectWithDisabled, forms.SelectMultiple):
def optgroups(self, name, value, attrs=None):
# Split the delimited string of values into a list
value = value[0].split(self.delimiter)
if value:
value = value[0].split(self.delimiter)
return super(ArrayFieldSelectMultiple, self).optgroups(name, value, attrs)
def value_from_datadict(self, data, files, name):

2
netbox/utilities/utils.py
View File

@@ -14,7 +14,7 @@ def csv_format(data):
for value in data:
# Represent None or False with empty string
if value in [None, False]:
if value is None or value is False:
csv.append('')
continue