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

Fixes #6910: Fix exception on invalid CSV import column name

Browse Source
This commit is contained in:
jeremystretch
2021-08-09 09:20:22 -04:00
parent a8b6902829
commit 7bcebd5b0f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.11.md
View File

@ -12,6 +12,7 @@
* [#6892](https://github.com/netbox-community/netbox/issues/6892) - Fix validation of unit ranges when creating a rack reservation
* [#6902](https://github.com/netbox-community/netbox/issues/6902) - Populate device field when cloning device components
* [#6909](https://github.com/netbox-community/netbox/issues/6909) - Remove extraneous `site` column from VLAN group import form
* [#6910](https://github.com/netbox-community/netbox/issues/6910) - Fix exception on invalid CSV import column name
---

2
netbox/netbox/views/generic.py
View File

@ -675,7 +675,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
)
def clean(self):
csv_rows = self.cleaned_data['csv'][1]
csv_rows = self.cleaned_data['csv'][1] if 'csv' in self.cleaned_data else None
csv_file = self.files.get('csv_file')
# Check that the user has not submitted both text data and a file